[gummi] Small fix in spec file

[Fabian Affolter]

commit ac4850afd645c2b614372ceed68b9e2636e65227
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Nov 17 13:29:01 2011 +0100

    Small fix in spec file

 gummi.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/gummi.spec b/gummi.spec
index ef6c818..930438b 100644
--- a/gummi.spec
+++ b/gummi.spec
@@ -60,7 +60,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Nov 17 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.0-1
 - Updated to new upstream version 0.6.0