[kactivities/f17] fix merge

[Rex Dieter]

commit a90a296c777330c3f7decacb62a2db7c2219b70d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 14:43:37 2012 -0500

    fix merge

 kactivities.spec |   12 ------------
 sources          |    4 ----
 2 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/kactivities.spec b/kactivities.spec
index a6a18ac..2b4b6e9 100644
--- a/kactivities.spec
+++ b/kactivities.spec
@@ -1,10 +1,6 @@
 Name:    kactivities
 Summary: API for using and interacting with Activities 
-<<<<<<< HEAD
-Version: 4.8.5
-=======
 Version: 4.9.1
->>>>>>> master
 Release: 1%{?dist}
 
 License: GPLv2+ and LGPLv2+
@@ -92,13 +88,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
-<<<<<<< HEAD
-* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.5-1
-- 4.8.5
-
-* Mon Jun 04 2012 Than Ngo <than at redhat.com> - 4.8.4-1
-- 4.8.4
-=======
 * Mon Sep 03 2012 Than Ngo <than at redhat.com> - 4.9.1-1
 - 4.9.1
 
@@ -122,7 +111,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 * Fri May 25 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.80-1
 - 4.8.80
->>>>>>> master
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.3-1
 - 4.8.3
diff --git a/sources b/sources
index 3ff907c..c810a7b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-122210ba323efd9d465b87fd07d6dcbb  kactivities-4.8.5.tar.xz
-=======
 41d8fc71098b66efb853a9bb70b8aed3  kactivities-4.9.1.tar.xz
->>>>>>> master