Migration squash

2 files changed, 26 insertions, 36 deletions

diff --git a/archaeological_operations/migrations/0104_auto_20201104_0959.py b/archaeological_operations/migrations/0104_auto_20201201_1533.py
index 356f5855c..ecebaca24 100644
--- a/archaeological_operations/migrations/0104_auto_20201104_0959.py
+++ b/archaeological_operations/migrations/0104_auto_20201201_1533.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-04 09:59
+# Generated by Django 1.11.27 on 2020-12-01 15:33
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -22,18 +22,43 @@ class Migration(migrations.Migration):
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
         migrations.AddField(
+            model_name='archaeologicalsite',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
             model_name='historicalarchaeologicalsite',
             name='complete_identifier',
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
         migrations.AddField(
+            model_name='historicalarchaeologicalsite',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
             model_name='historicaloperation',
             name='complete_identifier',
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
         migrations.AddField(
+            model_name='historicaloperation',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
             model_name='operation',
             name='complete_identifier',
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
+        migrations.AddField(
+            model_name='operation',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AlterField(
+            model_name='relationtype',
+            name='logical_relation',
+            field=models.CharField(blank=True, choices=[('above', 'Above'), ('below', 'Below'), ('equal', 'Equal'), ('include', 'Include'), ('included', 'Is included')], max_length=10, null=True, verbose_name='Logical relation'),
+        ),
     ]
diff --git a/archaeological_operations/migrations/0105_auto_20201117_0759.py b/archaeological_operations/migrations/0105_auto_20201117_0759.py
deleted file mode 100644
index 7514368e5..000000000
--- a/archaeological_operations/migrations/0105_auto_20201117_0759.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-17 07:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_operations', '0104_auto_20201104_0959'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='archaeologicalsite',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='historicalarchaeologicalsite',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='historicaloperation',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='operation',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-    ]