From 510aed6681c097d64506fc39f5f9f912e8ffc789 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 7 Mar 2011 16:10:43 -0800
Subject: [PATCH] finish cleaning up the stupid merge

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

diff --git a/libindicator.spec b/libindicator.spec
index 640f926..dc5db6e 100644
--- a/libindicator.spec
+++ b/libindicator.spec
@@ -147,7 +147,6 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so
 
 * Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> - 0.3.17-2
  Rebuild against newer gtk3
->>>>>>> b35e4871d3bdea0c2963a62dc3933e5df4346765
 
 * Sun Jan 23 2011 Adam Williamson <awilliam@redhat.com> - 0.3.17-1
 - new version 0.3.17