X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Ftranslations%2Fmessages.fr.yml;fp=src%2FWallabag%2FCoreBundle%2FResources%2Ftranslations%2Fmessages.fr.yml;h=beb8f3245a76a325143f49f158b7b50ddc002765;hb=6a50b4ccb58860f5db872745c7f1894c75cdd027;hp=be8751ff971a4affd6de63e7c152f3d938c5be4d;hpb=56c81a2f433eaba98f8cf0bfdd3672bc517ae266;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index be8751ff..beb8f324 100644
--- 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"