[polkit/f14/master: 4/4] Resolve merge conflicts

[David Zeuthen]

commit 3f5e8d36b51818534bd3763707a4e8c562af9fa6
Merge: c17d87e a98bb71
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Aug 20 13:37:10 2010 -0400

    Resolve merge conflicts

 .gitignore                         |    1 +
 polkit-0.97-subject-scanning.patch |   76 ------------------------------------
 polkit.spec                        |   16 ++-----
 sources                            |    2 +-
 4 files changed, 7 insertions(+), 88 deletions(-)
---
diff --cc polkit.spec
index 7b8e124,10cc453..bda3bc1
--- a/polkit.spec
+++ b/polkit.spec
@@@ -191,9 -182,9 +182,12 @@@ EO
  %{_datadir}/gtk-doc/html/*
  
  %changelog
+ * Fri Aug 20 2010 David Zeuthen <davidz at redhat.com> - 0.98-1
+ - Update to upstream release 0.98
+ 
 +* Wed Aug 18 2010 Matthias Clasen <mclasen at redhat.com> - 0.97-5
 +- Rebuid to work around bodhi limitations
 +
  * Wed Aug 18 2010 Matthias Clasen <mclasen at redhat.com> - 0.97-4
  - Fix a ConsoleKit interaction bug