aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/locales/compliance_controls.fr.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index e6cc52516..0d76181e1 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -50,4 +50,3 @@ fr:
criticity: Criticité
comment: Commentaire
code: Code
->>>>>>> I18n compliance control