[R-affydata/f15] Remove left over from merge

[Pierre-YvesChibon]

commit 2f93f771e8cede0574231babd6839c4ea19fe51c
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Nov 3 09:42:26 2011 +0100

    Remove left over from merge

 R-affydata.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/R-affydata.spec b/R-affydata.spec
index ac78d93..c36111d 100644
--- a/R-affydata.spec
+++ b/R-affydata.spec
@@ -1,11 +1,7 @@
 %global packname  affydata
 
 Name:             R-%{packname}
-<<<<<<< HEAD
-Version:          1.11.11
-=======
 Version:          1.11.15
->>>>>>> master
 Release:          1%{dist}
 Summary:          Affymetrix data for demonstration purpose