From edfc3dbfc2b4f32d820da9997bf401054667ca71 Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Fri, 19 Dec 2014 14:06:10 +0800
Subject: [PATCH] fix the problem with file "Version"

---
 Version | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Version b/Version
index 527f554f3..37989bd16 100644
--- a/Version
+++ b/Version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 2.10
-=======
-2.9
->>>>>>> 02981fa... add pkglist and template for fedora21 ppc64le