translation: fix error with translation file

Co-Authored-by: Aly Badr <aly.badr@rero.ch>
rero · Feb 18, 2020 · 95216b6 · 95216b6
1 parent d1a0c05
commit 95216b6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rero_ils/translations/fr/LC_MESSAGES/messages.po b/rero_ils/translations/fr/LC_MESSAGES/messages.po
@@ -7256,7 +7256,3 @@ msgstr "a été supprimé."
 #: rero_ils/templates/security/email/reset_instructions.html:21
 msgid "Click here to reset your password"
 msgstr "Cliquez ici pour réinitialiser votre mot de passe"
-<<<<<<< HEAD
-=======
-
->>>>>>> permissions: update and delete permissions api for records