diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 |
| commit | 507d9eb44c328e13ffff26e4301d7e80bfc91f4d (patch) | |
| tree | b497011ebb4ea4b899eb3c5ebeae6af15c2816c4 /Makefile.example | |
| parent | 7522e7a325fb8ebad5f20bbfb5253b4be24e2cd0 (diff) | |
| parent | 4509e950fbe35e6f529c4469dfc7802686fce28e (diff) | |
| download | Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.tar.bz2 Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.example b/Makefile.example index 837bc74cd..7ea3d8304 100644 --- a/Makefile.example +++ b/Makefile.example @@ -126,6 +126,7 @@ fixtures_common: fixtures_common_importers fixtures_common_towns ishtar_common.persontype \ ishtar_common.organizationtype \ ishtar_common.sourcetype \ + ishtar_common.operationtype \ > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' fixtures_common_importers: @@ -150,7 +151,6 @@ fixtures_common_towns: fixtures_operations: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ archaeological_operations.acttype \ - archaeological_operations.operationtype \ archaeological_operations.period \ archaeological_operations.remaintype \ > '../archaeological_operations/fixtures/initial_data-'$(default_data)'.json' |