[blinken/f17] arg, fix merge

[Rex Dieter]

commit e84f21e5ef29e2773d33ebde2675016db1052b92
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 11:58:01 2012 -0500

    arg, fix merge

 blinken.spec |   12 ------------
 sources      |    4 ----
 2 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/blinken.spec b/blinken.spec
index 0c3e645..7b4c60c 100644
--- a/blinken.spec
+++ b/blinken.spec
@@ -1,10 +1,6 @@
 Name:    blinken 
 Summary: Memory Enhancement Game 
-<<<<<<< HEAD
-Version: 4.8.5
-=======
 Version: 4.9.1
->>>>>>> master
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -80,13 +76,6 @@ fi
 
 
 %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
 
@@ -107,7 +96,6 @@ fi
 
 * 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 90af0c3..d6265d6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-770a9e865fd6a9c68b320b54865f15c0  blinken-4.8.5.tar.xz
-=======
 bc48b795dc2fcfc26821192f5a29bdab  blinken-4.9.1.tar.xz
->>>>>>> master