Fix fr.po

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3765 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/po/fr.po b/bacula/po/fr.po
index 75749e456eaed67f8d2e66c3e96657456a66733c..0485621408728b2c2d7bc70cbf00a0129eed71a6 100644 (file)
--- a/bacula/po/fr.po
+++ b/bacula/po/fr.po
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-<<<<<<< fr.po
-"POT-Creation-Date: 2006-12-06 10:02+0100\n"
-"PO-Revision-Date: 2006-12-06 22:09+0100\n"
-=======
 "POT-Creation-Date: 2006-12-06 20:24+0100\n"
 "PO-Revision-Date: 2006-11-20 20:16+0100\n"
->>>>>>> 1.31
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"