[libgee] post-merge clean-up

[Michel Alexandre Salim]

commit e8ca34057eca4f56a41cd2580f6f44b9f51b9d1a
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Sep 23 08:53:37 2010 +0200

    post-merge clean-up

 libgee.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/libgee.spec b/libgee.spec
index 9323053..a408f06 100644
--- a/libgee.spec
+++ b/libgee.spec
@@ -96,7 +96,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Sep 23 2010 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 - Rebuild against newer gobject-introspection