diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 02:32:00 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 02:32:00 +0200 |
| commit | ecf8b2435ca903dc9b70c514dafdc28f69640bb0 (patch) | |
| tree | 5ad7d6084ad9ea05c3a98beb793cc2d0148cd627 /ishtar_common/fixtures | |
| parent | e0c695fcdd1e959adeda6f0ec71318b15573bae2 (diff) | |
| parent | e78b63aa971cc6239c1c322a58a5fca23b4629e7 (diff) | |
| download | Ishtar-ecf8b2435ca903dc9b70c514dafdc28f69640bb0.tar.bz2 Ishtar-ecf8b2435ca903dc9b70c514dafdc28f69640bb0.zip | |
Merge branch 'stable'
Diffstat (limited to 'ishtar_common/fixtures')
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 0a8814274..f7c67fe6d 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -1419,5 +1419,13 @@ "column": 37, "field_name": "find__label" } + }, + { + "pk": 4, + "model": "ishtar_common.importerduplicatefield", + "fields": { + "column": 5, + "field_name": "in_charge__name" + } } ]
\ No newline at end of file |