summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 22:32:46 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 22:32:46 +0200
commit62b1487eac9d81bfcb1f9a80b80e7169734f4bf2 (patch)
tree1f19076464a4e91b0d44363ed3d14bfb3a4fc0a0
parent6faa87a30294b0f555602f2738858cb078647236 (diff)
parent63739c62678338388a993a636c670579c5e8fd10 (diff)
downloadIshtar-62b1487eac9d81bfcb1f9a80b80e7169734f4bf2.tar.bz2
Ishtar-62b1487eac9d81bfcb1f9a80b80e7169734f4bf2.zip
Merge branch 'master' into master-WIP-treatments
-rw-r--r--ishtar_common/fixtures/initial_importtypes-fr.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 7a4f6fe0f..638061d6f 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -742,7 +742,7 @@
"model": "ishtar_common.importtarget",
"fields": {
"comment": null,
- "target": "find__preservation_to_consider",
+ "target": "find__preservation_to_considers",
"column": 46,
"formater_type": 23,
"concat_str": null,
@@ -2031,4 +2031,4 @@
"force_new": false
}
}
-] \ No newline at end of file
+]