Fix typo in french language file #18

7 years ago · 7a0b3b3750
parent 9c9ba64a7f
commit 7a0b3b3750
1 changed files with 0 additions and 1 deletions
--- 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 !';