diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_finds/migrations/0001_initial.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_finds/migrations/0001_initial.py')
| -rw-r--r-- | archaeological_finds/migrations/0001_initial.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/archaeological_finds/migrations/0001_initial.py b/archaeological_finds/migrations/0001_initial.py index 4b23372c0..f9e94d04b 100644 --- a/archaeological_finds/migrations/0001_initial.py +++ b/archaeological_finds/migrations/0001_initial.py @@ -7,6 +7,12 @@ from django.db import models class Migration(SchemaMigration): + depends_on = ( + ('archaeological_context_records', '0001_initial.py'), + ('archaeological_warehouse', + '0011_auto__add_containerlocalisation__add_unique_containerlocalisation_cont.py'), + ) + def forwards(self, orm): # Adding model 'MaterialType' db.create_table('archaeological_finds_materialtype', ( @@ -1331,4 +1337,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['archaeological_finds']
\ No newline at end of file + complete_apps = ['archaeological_finds'] |