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
commit3cc85d1009e76c8ae03cc57b59e086fb496b8923 (patch)
tree1f19076464a4e91b0d44363ed3d14bfb3a4fc0a0
parent267925c88d3880fd59278073b3f9808f5d89a9e6 (diff)
parentfb8a31202c06de98b196bd14494ed1efeeb63ac9 (diff)
downloadIshtar-3cc85d1009e76c8ae03cc57b59e086fb496b8923.tar.bz2
Ishtar-3cc85d1009e76c8ae03cc57b59e086fb496b8923.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
+]