[rkward/f15] Remove merge stuff

[Pierre-YvesChibon]

commit 80c9af0f2321432fb81fc1c20191abf455d56d41
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Oct 25 10:12:44 2011 +0200

    Remove merge stuff

 rkward.spec |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/rkward.spec b/rkward.spec
index fe8696d..6b184ea 100644
--- a/rkward.spec
+++ b/rkward.spec
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
 %global  Rversion 2.13.2
 
 Name:           rkward
 Version:        0.5.7
 Release:        1%{?dist}
-=======
-%global  Rversion 2.13.1
-
-Name:           rkward
-Version:        0.5.6
-Release:        2%{?dist}
->>>>>>> a0f4dcf5799ab3fdcbf2bbd14be0184454025386
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -108,7 +100,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_kde4_appsdir}/katepart/syntax/%{name}.xml
 
 %changelog
-<<<<<<< HEAD
 * Tue Oct 23 2011 Pierre-Yves Chibon <pingou at pingoured.fr> 0.5.7-1
 - Update to 0.5.7
 
@@ -116,9 +107,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 - rebuild for R 2.13.2
 
 * Mon Jul 11 2011 Tom Callaway <spot at fedoraproject.org> 0.5.6-2
-=======
-* Tue Jul 12 2011 Tom Callaway <spot at fedoraproject.org> 0.5.6-2
->>>>>>> a0f4dcf5799ab3fdcbf2bbd14be0184454025386
 - rebuild for R 2.13.1
 
 * Tue Jun 21 2011 Pierre-Yves Chibon <pingou at pingoured.fr> 0.5.6-1