[evince: 2/2] fix merge conflict

[Matthias Clasen]

commit 2e417d6cce179d0258d5b41a27be407dc52e9a73
Merge: 428fdb8 27bad9f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Aug 19 17:14:26 2010 -0400

    fix merge conflict

 evince.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc evince.spec
index aa6d512,879a909..bf0fe9a
--- a/evince.spec
+++ b/evince.spec
@@@ -237,9 -239,9 +237,12 @@@ glib-compile-schemas --allow-any-name %
  %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
  
  %changelog
 +* Thu Aug 19 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.90-1
 +- Update to 2.31.90
 +
+ * Thu Aug 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.31.6-2
+ - rebuild (poppler)
+ 
  * Mon Aug  2 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.6-1
  - Update to 2.31.6