diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
| commit | 6b736e9d50b56ad9eee6735d10425e00e1c3f446 (patch) | |
| tree | 18c73e99e1395738657ef23541f6d78583e16b7a /archaeological_operations/tests | |
| parent | 307520f3df65cf925609a4e66eb2628a198cabb5 (diff) | |
| parent | 353f779f15a2b3fbee066eb7a7151002f19e2256 (diff) | |
| download | Ishtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.tar.bz2 Ishtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/data_importer.py
Diffstat (limited to 'archaeological_operations/tests')
| -rw-r--r-- | archaeological_operations/tests/MCC-operations-example.csv | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_operations/tests/MCC-operations-example.csv b/archaeological_operations/tests/MCC-operations-example.csv index 4962c0969..432ceffca 100644 --- a/archaeological_operations/tests/MCC-operations-example.csv +++ b/archaeological_operations/tests/MCC-operations-example.csv @@ -1,2 +1,2 @@ code OA,region,type operation,intitule operation,operateur,responsable operation,date debut terrain,date fin terrain,chronologie generale,identifiant document georeferencement,notice scientifique -4200,Bourgogne,Fouille programmée,Oppidum de Paris,L'opérateur,Jean Sui-Resp'on Sablé,2000/01/22,2002/12/31,Age du Fer & Gallo-Romain,, +4200,Bourgogne,Fouille programmée,Oppìdum de Paris,L'opérateur,Jean Sui-Resp'on Sablé,2000/01/22,2002/12/31,Age du Fer & Gallo-Romain,, |