[evince: 4/4] remove conflict marker

[Matthias Clasen]

commit bc78942a3634f0d16e327f9b304f9d0f871c1001
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Nov 1 21:54:16 2010 -0400

    remove conflict marker

 evince.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/evince.spec b/evince.spec
index 9ae14a7..9892cc0 100644
--- a/evince.spec
+++ b/evince.spec
@@ -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 at redhat.com> - 2.91.1-2
 - Rebuild against newer gtk3