# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1317213223 -7200
# Node ID 974a8653aedee3ece4b0c8e3ca9978229d09cbf3
# Parent  46abc9a31ce48289c6a87fc895e83435603140d9
remove remaining junk from bad merge

diff -r 46abc9a31ce4 -r 974a8653aede i18n/de.po
--- 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
diff -r 46abc9a31ce4 -r 974a8653aede i18n/es.po
--- a/i18n/es.po	Wed Sep 28 11:17:49 2011 +0200
+++ b/i18n/es.po	Wed Sep 28 14:33:43 2011 +0200
@@ -4509,7 +4509,6 @@
 msgstr ""
 "usted debe  quitar la puesta en línea de la relación %s que es aceptada y "
 "puede ser cruzada"
-<<<<<<< /home/syt/src/cubicweb/i18n/es.po
 
 #~ msgid "Schema of the data model"
 #~ msgstr "Esquema del modelo de datos"
@@ -4522,5 +4521,3 @@
 
 #~ msgid "siteinfo"
 #~ msgstr "información"
-=======
->>>>>>> /tmp/es.po~other.Yb6Y5q