From 7a0b3b3750f32d11d9b01b748bbd44fe2e78f6cd Mon Sep 17 00:00:00 2001 From: Sylvain Tissot Date: Mon, 21 Aug 2017 13:55:18 +0200 Subject: [PATCH] Fix typo in french language file #18 --- languages/fr.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/languages/fr.lang b/languages/fr.lang index 9f7835cf..78701df4 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -186,7 +186,6 @@ $PALANG['pPassword_recovery_no_alternative'] = "Aucun moyen de contact alternati $PALANG['pPassword_password_code'] = 'Code reçu par email/SMS'; $PALANG['pPassword_code_text_error'] = 'Code invalide'; ->>>>>>> Allows a user or admin to reset his/her forgotten password with a code sent by email/SMS #18 $PALANG['pEdit_vacation_set'] = 'Activer le répondeur'; $PALANG['pEdit_vacation_remove'] = 'Désactiver le répondeur'; $PALANG['pVacation_result_error'] = 'Impossible de mettre à jour les réglages du répondeur de %s !';