--- a/i18n/de.po	Wed Sep 28 11:17:49 2011 +0200
+++ b/i18n/de.po	Wed Sep 28 14:33:43 2011 +0200
@@ -4461,12 +4461,9 @@
 #, python-format
 msgid "you should un-inline relation %s which is supported and may be crossed "
 msgstr ""
-<<<<<<< /home/syt/src/cubicweb/i18n/de.po
 
 #~ msgid "Schema of the data model"
 #~ msgstr "Schema des Datenmodells"
 
 #~ msgid "instance schema"
 #~ msgstr "Schema der Instanz"
-=======
->>>>>>> /tmp/de.po~other.fn7YK0