fix merge conflict

This commit is contained in:
Matthias Clasen 2010-08-19 17:14:26 -04:00
commit 2e417d6cce

View File

@ -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