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