diff options
| author | Xinhui | 2017-09-19 15:22:30 +0200 |
|---|---|---|
| committer | Xinhui | 2017-09-19 15:22:30 +0200 |
| commit | faa11cd4dcde1fafb92c5b5a99be4d3fe356e8f0 (patch) | |
| tree | 6efc2e048d383c174d6957796c3b825a6e5afff3 | |
| parent | 14c4b49144f334e375b34c5b6a7b1d14c9617858 (diff) | |
| download | chouette-core-faa11cd4dcde1fafb92c5b5a99be4d3fe356e8f0.tar.bz2 | |
Fix rebase conflit
| -rw-r--r-- | config/locales/compliance_controls.fr.yml | 1 |
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 |