fix the problem with file "Version"

2014-12-19 14:06:10 +08:00 · 2014-12-19 14:06:10 +08:00 · edfc3dbfc2
commit edfc3dbfc2
parent 999a474a5b
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -1,5 +1 @@
-<<<<<<< HEAD
 2.10
-=======
-2.9
->>>>>>> 02981fa... add pkglist and template for fedora21 ppc64le