--- 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"

--- a/i18n/es.po	Mon Sep 26 19:24:08 2011 +0200
+++ b/i18n/es.po	Mon Sep 26 19:35:44 2011 +0200
@@ -1094,12 +1094,6 @@
 msgid "add a CWRType"
 msgstr "Agregar un tipo de relación"
 
-<<<<<<< /home/syt/src/cubicweb/i18n/es.po
-msgid "add a CWSource"
-msgstr "agregar una fuente"
-
-=======
->>>>>>> /tmp/es.po~other.Yb6Y5q
 msgctxt "inlined:CWUser.use_email.subject"
 msgid "add a EmailAddress"
 msgstr "Agregar correo electrónico"

--- a/i18n/fr.po	Mon Sep 26 19:24:08 2011 +0200
+++ b/i18n/fr.po	Mon Sep 26 19:35:44 2011 +0200
@@ -1094,12 +1094,6 @@
 msgid "add a CWRType"
 msgstr "ajouter un type de relation"
 
-<<<<<<< /home/syt/src/cubicweb/i18n/fr.po
-msgid "add a CWSource"
-msgstr "ajouter une source"
-
-=======
->>>>>>> /tmp/fr.po~other.KbuYNx
 msgctxt "inlined:CWUser.use_email.subject"
 msgid "add a EmailAddress"
 msgstr "ajouter une adresse électronique"