[asciinema] Misconfiguration in spec file

[Jakub Jedelsky]

commit fa27c2e0c622bbcf33c2e0f9a74251b6b964d57e
Author: Jakub Jedelsky <jakub.jedelsky at gmail.com>
Date:   Fri Mar 6 23:27:20 2015 +0100

    Misconfiguration in spec file

 asciinema.spec | 9 ---------
 1 file changed, 9 deletions(-)
---
diff --git a/asciinema.spec b/asciinema.spec
index 29e6b40..53677b0 100644
--- a/asciinema.spec
+++ b/asciinema.spec
@@ -3,13 +3,6 @@
 %global provider_tld		com
 %global	pkgname			asciinema
 %global project			%{pkgname}-cli
-
-<<<<<<< HEAD
-Name:		asciinema
-Version:	0.9.8
-Release:	2%{?dist}
-Summary:	Command line recorder for asciinema.org service
-=======
 %global	import_path		%{provider}.%{provider_tld}/%{pkgname}/%{project}
 
 %global commit			b68b7e6333e971fc1960c647b4ccfb451ca7f39c
@@ -20,8 +13,6 @@ Name:		%{pkgname}
 Version:	0.9.9
 Release:	1%{?dist}
 Summary:	Command line client (terminal recorder) for asciinema.org service
->>>>>>> Update to new version
-
 Group:		Applications/Internet
 License:	GPLv3
 URL:		http://asciinema.org