[ksaneplugin/f18] fix merge (grr)

[Rex Dieter]

commit 98fb22680ff79614a6756f6956aae5df2a63525e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:17:48 2013 -0600

    fix merge (grr)

 .gitignore       |    9 ---------
 ksaneplugin.spec |    9 ---------
 sources          |    4 ----
 3 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bce6e7..63347d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
-<<<<<<< HEAD
-/ksaneplugin-4.8.5.tar.xz
-/ksaneplugin-4.9.1.tar.xz
-/ksaneplugin-4.9.2.tar.xz
-/ksaneplugin-4.9.3.tar.xz
-/ksaneplugin-4.9.4.tar.xz
-/ksaneplugin-4.9.5.tar.xz
-=======
 /ksaneplugin-4.10.1.tar.xz
->>>>>>> master
diff --git a/ksaneplugin.spec b/ksaneplugin.spec
index 144b1f3..3a93a17 100644
--- a/ksaneplugin.spec
+++ b/ksaneplugin.spec
@@ -1,10 +1,6 @@
 Name:    ksaneplugin
 Summary: KDE sane service 
-<<<<<<< HEAD
-Version: 4.9.5
-=======
 Version: 4.10.1
->>>>>>> master
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -55,10 +51,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
-<<<<<<< HEAD
-* Sat Dec 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-1
-- 4.9.5
-=======
 * Sat Mar 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.1-1
 - 4.10.1
 
@@ -76,7 +68,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 * Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.90-1
 - 4.9.90
->>>>>>> master
 
 * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
 - 4.9.4
diff --git a/sources b/sources
index e502202..04957f8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-36a41c7046afa40f2dbbae5d67ffb505  ksaneplugin-4.9.5.tar.xz
-=======
 2d07f8f5ebacc3fc1342bbe40261f9aa  ksaneplugin-4.10.1.tar.xz
->>>>>>> master