Added group in user form

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / translations / messages.fr.yml

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index be8751ff971a4affd6de63e7c152f3d938c5be4d..beb8f3245a76a325143f49f158b7b50ddc002765 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -16,7 +16,6 @@ security:
 
 menu:
     left:
-<<<<<<< 5da541f5bdeec8ad968ba75a30ca2d19ea64d1f2
         unread: "Non lus"
         starred: "Favoris"
         archive: "Lus"