Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

2014-12-19 00:22:33 -08:00 · 2014-12-19 00:22:33 -08:00 · 3e88f028ff
commit 3e88f028ff
parent 4cc51b28fd edfc3dbfc2
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