remove conflict marker

This commit is contained in:
Matthias Clasen 2010-11-01 21:54:16 -04:00
parent f84468d401
commit bc78942a36

View File

@ -243,7 +243,6 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
%{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
%changelog
<<<<<<< HEAD
* Mon Nov 1 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.1-2
- Rebuild against newer gtk3