--- a/i18n/fr.po	Wed Jun 29 20:57:28 2011 +0200
+++ b/i18n/fr.po	Thu Jun 30 13:38:30 2011 +0200
@@ -4104,13 +4104,8 @@
 msgid "tr_count"
 msgstr "n° de transition"
 
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/i18n/fr.po
-msgid "transaction undoed"
-msgstr "transaction annulée"
-=======
 msgid "transaction undone"
 msgstr "transaction annulée"
->>>>>>> /tmp/fr.po~other.p9Lq3c
 
 #, python-format
 msgid "transition %(tr)s isn't allowed from %(st)s"