From fcef36d1fcc4bf60d33c16ed8775746d4ca89305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Tue, 7 Jun 2011 13:27:38 +0200
Subject: [PATCH] Fixup merge

---
 po/fr.po | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index cf99204ca8..f4b2828e4d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8079,13 +8079,8 @@ msgstr "passepartout"
 
 #: server_privileges.php:2295
 #| msgid "View %s has been dropped"
-<<<<<<< HEAD
 msgid "User has been added."
 msgstr "La vue %s a été supprimée"
-=======
-msgid "New user has been added."
-msgstr "Un utilisateur a été ajouté"
->>>>>>> pootle/master
 
 #: server_processlist.php:29
 #, php-format