--- a/__pkginfo__.py	Mon Sep 26 19:24:08 2011 +0200
+++ b/__pkginfo__.py	Mon Sep 26 19:35:44 2011 +0200
@@ -22,11 +22,7 @@
 
 modname = distname = "cubicweb"
 
-<<<<<<< /home/syt/src/cubicweb/__pkginfo__.py
 numversion = (3, 14, 0)
-=======
-numversion = (3, 13, 6)
->>>>>>> /tmp/__pkginfo__.py~other.Prvgd6
 version = '.'.join(str(num) for num in numversion)
 
 description = "a repository of entities / relations for knowledge management"