From 81013218715768f6a1501e95043b518814780fff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 30 Mar 2020 15:45:11 -0700
Subject: [PATCH] Fixes merge for migration numbers

---
 .../migrations/0026_auto_20200330_1943.py     | 28 -------------------
 ...330_2042.py => 0027_auto_20200330_2232.py} | 19 +++++++++++--
 2 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 fedireads/migrations/0026_auto_20200330_1943.py
 rename fedireads/migrations/{0027_auto_20200330_2042.py => 0027_auto_20200330_2232.py} (78%)

diff --git a/fedireads/migrations/0026_auto_20200330_1943.py b/fedireads/migrations/0026_auto_20200330_1943.py
deleted file mode 100644
index f9d74781..00000000
--- a/fedireads/migrations/0026_auto_20200330_1943.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 3.0.3 on 2020-03-30 19:43
-
-from django.db import migrations, models
-import fedireads.utils.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fedireads', '0025_auto_20200330_0037'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='book',
-            name='language',
-        ),
-        migrations.AddField(
-            model_name='book',
-            name='languages',
-            field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
-        ),
-        migrations.AddField(
-            model_name='edition',
-            name='default',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/fedireads/migrations/0027_auto_20200330_2042.py b/fedireads/migrations/0027_auto_20200330_2232.py
similarity index 78%
rename from fedireads/migrations/0027_auto_20200330_2042.py
rename to fedireads/migrations/0027_auto_20200330_2232.py
index 4fcbe73c..6c33e82b 100644
--- a/fedireads/migrations/0027_auto_20200330_2042.py
+++ b/fedireads/migrations/0027_auto_20200330_2232.py
@@ -1,16 +1,21 @@
-# Generated by Django 3.0.3 on 2020-03-30 20:42
+# Generated by Django 3.0.3 on 2020-03-30 22:32
 
 from django.db import migrations, models
 import django.db.models.deletion
+import fedireads.utils.fields
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0026_auto_20200330_1943'),
+        ('fedireads', '0026_auto_20200330_1456'),
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name='book',
+            name='language',
+        ),
         migrations.RemoveField(
             model_name='book',
             name='parent_work',
@@ -19,6 +24,16 @@ class Migration(migrations.Migration):
             model_name='book',
             name='shelves',
         ),
+        migrations.AddField(
+            model_name='book',
+            name='languages',
+            field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+        ),
+        migrations.AddField(
+            model_name='edition',
+            name='default',
+            field=models.BooleanField(default=False),
+        ),
         migrations.AddField(
             model_name='edition',
             name='parent_work',