From 2e417d6cce179d0258d5b41a27be407dc52e9a73 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Aug 19 2010 21:14:26 +0000
Subject: fix merge conflict


---

diff --git a/evince.spec b/evince.spec
index aa6d512..bf0fe9a 100644
--- a/evince.spec
+++ b/evince.spec
@@ -240,6 +240,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 * Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.90-1
 - Update to 2.31.90
 
+* Thu Aug 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.31.6-2
+- rebuild (poppler)
+
 * Mon Aug  2 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.6-1
 - Update to 2.31.6