# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1309433910 -7200
# Node ID 7588240bcb367b2e14f396929f65963c6474461c
# Parent  b3688b15d7f5754018f0dd3483cfcc2f9daba2c9
[i18n] fix undetected conflict

diff -r b3688b15d7f5 -r 7588240bcb36 i18n/fr.po
--- 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"
diff -r b3688b15d7f5 -r 7588240bcb36 web/views/navigation.py
--- a/web/views/navigation.py	Wed Jun 29 20:57:28 2011 +0200
+++ b/web/views/navigation.py	Thu Jun 30 13:38:30 2011 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.