From faa11cd4dcde1fafb92c5b5a99be4d3fe356e8f0 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Tue, 19 Sep 2017 15:22:30 +0200
Subject: Fix rebase conflit

---
 config/locales/compliance_controls.fr.yml | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3