[kamera/f17] fix another botched merge

[Rex Dieter]

commit 139b75a61585ae2590001a4c294a0dc7db192a6f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:45:00 2012 -0500

    fix another botched merge

 kamera.spec |   12 ------------
 sources     |    4 ----
 2 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/kamera.spec b/kamera.spec
index d354c8e..9311b55 100644
--- a/kamera.spec
+++ b/kamera.spec
@@ -1,10 +1,6 @@
 Name:    kamera
 Summary: Digital camera support for KDE 
-<<<<<<< HEAD
-Version: 4.8.5
-=======
 Version: 4.9.1
->>>>>>> master
 Release: 1%{?dist}
 
 License: GPLv2
@@ -59,13 +55,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
 
@@ -86,7 +75,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 * Fri Jun 01 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 2d62630..3584a0d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-bc248c66905c2f18c657df7158119c72  kamera-4.8.5.tar.xz
-=======
 9866306698ed24f8b91cd1e15343b844  kamera-4.9.1.tar.xz
->>>>>>> master