From e8ca34057eca4f56a41cd2580f6f44b9f51b9d1a Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 23 Sep 2010 08:53:37 +0200
Subject: [PATCH] post-merge clean-up

---
 libgee.spec | 1 -
 1 file changed, 1 deletion(-)

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@fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 - Rebuild against newer gobject-introspection