remove conflict marker
This commit is contained in:
parent
f84468d401
commit
bc78942a36
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user