aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
1 files changed, 0 insertions, 1 deletions
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:
16 16
17menu: 17menu:
18 left: 18 left:
19<<<<<<< 5da541f5bdeec8ad968ba75a30ca2d19ea64d1f2
20 unread: "Non lus" 19 unread: "Non lus"
21 starred: "Favoris" 20 starred: "Favoris"
22 archive: "Lus" 21 archive: "Lus"