[PackageKit/f17] grr, botched cherry-pick conflict left-over

[Rex Dieter]

commit 5a34a71cb34d2fe7d7f05e8a8b1e8d0d2c0b0b59
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 25 11:31:26 2012 -0500

    grr, botched cherry-pick conflict left-over

 PackageKit.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit.spec b/PackageKit.spec
index dd35b14..0b50a10 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -464,7 +464,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
-<<<<<<< HEAD
 * Fri May 25 2012 Rex Dieter <rdieter at fedoraproject.org> 0.7.4-4
 - re-enable -browser-plugin content
 - make V=1