summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-12 12:15:12 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-12 12:15:12 +0200
commit2ec785911afd4fdbb26f626c989b04e3d2793248 (patch)
tree19ab8d8ad1cfc934d25f495af88d83500ac927fc
parentfd075332a121d7012528aad9fb5623753beec425 (diff)
downloadIshtar-2ec785911afd4fdbb26f626c989b04e3d2793248.tar.bz2
Ishtar-2ec785911afd4fdbb26f626c989b04e3d2793248.zip
Fix migration after merge
-rw-r--r--archaeological_files/migrations/0033_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py (renamed from archaeological_files/migrations/0032_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py)2
1 files changed, 2 insertions, 0 deletions
diff --git a/archaeological_files/migrations/0032_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py b/archaeological_files/migrations/0033_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py
index b2f841b09..d9097bd6d 100644
--- a/archaeological_files/migrations/0032_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py
+++ b/archaeological_files/migrations/0033_auto__chg_field_file_total_surface__chg_field_file_total_developed_sur.py
@@ -39,6 +39,7 @@ class Migration(SchemaMigration):
'archaeological_files.file': {
'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'},
'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
@@ -101,6 +102,7 @@ class Migration(SchemaMigration):
'archaeological_files.historicalfile': {
'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalFile'},
'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),