--- a/i18n/en.po	Wed Sep 28 09:01:17 2011 +0200
+++ b/i18n/en.po	Wed Sep 28 11:17:49 2011 +0200
@@ -4346,12 +4346,3 @@
 #, python-format
 msgid "you should un-inline relation %s which is supported and may be crossed "
 msgstr ""
-<<<<<<< /home/syt/src/cubicweb/i18n/en.po
-
-#~ msgid "add a CWSourceSchemaConfig"
-#~ msgstr "add an item to mapping "
-
-#~ msgid "siteinfo"
-#~ msgstr "site information"
-=======
->>>>>>> /tmp/en.po~other.NvgtGM