finish cleaning up the stupid merge

14 years ago · 510aed6681
parent 6a3321588d
commit 510aed6681
1 changed files with 0 additions and 1 deletions
--- 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