From 342ea7e679a1609a810f216549e403d2563d27a1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 1 Dec 2020 15:46:18 +0100
Subject: Migration squash

---
 .../migrations/0103_auto_20201104_1000.py          | 36 -----------------
 .../migrations/0103_auto_20201201_1534.py          | 46 ++++++++++++++++++++++
 .../migrations/0104_auto_20201117_0759.py          | 25 ------------
 3 files changed, 46 insertions(+), 61 deletions(-)
 delete mode 100644 archaeological_files/migrations/0103_auto_20201104_1000.py
 create mode 100644 archaeological_files/migrations/0103_auto_20201201_1534.py
 delete mode 100644 archaeological_files/migrations/0104_auto_20201117_0759.py

(limited to 'archaeological_files')

diff --git a/archaeological_files/migrations/0103_auto_20201104_1000.py b/archaeological_files/migrations/0103_auto_20201104_1000.py
deleted file mode 100644
index 566efa939..000000000
--- a/archaeological_files/migrations/0103_auto_20201104_1000.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-04 10:00
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import ishtar_common.utils
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_files', '0102_historicalfile_history_change_reason'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='file',
-            name='complete_identifier',
-            field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
-        ),
-        migrations.AddField(
-            model_name='file',
-            name='qrcode',
-            field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path),
-        ),
-        migrations.AddField(
-            model_name='historicalfile',
-            name='complete_identifier',
-            field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
-        ),
-        migrations.AddField(
-            model_name='historicalfile',
-            name='qrcode',
-            field=models.TextField(blank=True, max_length=255, null=True),
-        ),
-    ]
diff --git a/archaeological_files/migrations/0103_auto_20201201_1534.py b/archaeological_files/migrations/0103_auto_20201201_1534.py
new file mode 100644
index 000000000..55e54d3be
--- /dev/null
+++ b/archaeological_files/migrations/0103_auto_20201201_1534.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-12-01 15:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import ishtar_common.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0102_historicalfile_history_change_reason'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='file',
+            name='complete_identifier',
+            field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='qrcode',
+            field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path),
+        ),
+        migrations.AddField(
+            model_name='historicalfile',
+            name='complete_identifier',
+            field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
+        ),
+        migrations.AddField(
+            model_name='historicalfile',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
+            model_name='historicalfile',
+            name='qrcode',
+            field=models.TextField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/archaeological_files/migrations/0104_auto_20201117_0759.py b/archaeological_files/migrations/0104_auto_20201117_0759.py
deleted file mode 100644
index 3bb881ef3..000000000
--- a/archaeological_files/migrations/0104_auto_20201117_0759.py
+++ /dev/null
@@ -1,25 +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_files', '0103_auto_20201104_1000'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='file',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='historicalfile',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-    ]
-- 
cgit v1.2.3