From e9be31e9c159e6805860b035663d051e0c35f326 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 28 Nov 2020 19:05:12 -0800
Subject: [PATCH] merge migrations

---
 .../migrations/0016_auto_20201128_1804.py     | 24 ------------------
 ...128_1849.py => 0016_auto_20201129_0304.py} | 25 +++++++++++++++++--
 .../migrations/0018_auto_20201128_2142.py     | 24 ------------------
 3 files changed, 23 insertions(+), 50 deletions(-)
 delete mode 100644 bookwyrm/migrations/0016_auto_20201128_1804.py
 rename bookwyrm/migrations/{0017_auto_20201128_1849.py => 0016_auto_20201129_0304.py} (57%)
 delete mode 100644 bookwyrm/migrations/0018_auto_20201128_2142.py

diff --git a/bookwyrm/migrations/0016_auto_20201128_1804.py b/bookwyrm/migrations/0016_auto_20201128_1804.py
deleted file mode 100644
index 9becde82..00000000
--- a/bookwyrm/migrations/0016_auto_20201128_1804.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 3.0.7 on 2020-11-28 18:04
-
-import bookwyrm.utils.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0015_auto_20201128_0349'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='book',
-            name='subject_places',
-            field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
-        ),
-        migrations.AlterField(
-            model_name='book',
-            name='subjects',
-            field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0017_auto_20201128_1849.py b/bookwyrm/migrations/0016_auto_20201129_0304.py
similarity index 57%
rename from bookwyrm/migrations/0017_auto_20201128_1849.py
rename to bookwyrm/migrations/0016_auto_20201129_0304.py
index 722458b2..2bf820e1 100644
--- a/bookwyrm/migrations/0017_auto_20201128_1849.py
+++ b/bookwyrm/migrations/0016_auto_20201129_0304.py
@@ -1,5 +1,6 @@
-# Generated by Django 3.0.7 on 2020-11-28 18:49
+# Generated by Django 3.0.7 on 2020-11-29 03:04
 
+import bookwyrm.utils.fields
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,10 +9,30 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0016_auto_20201128_1804'),
+        ('bookwyrm', '0015_auto_20201128_0349'),
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='book',
+            name='subject_places',
+            field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+        ),
+        migrations.AlterField(
+            model_name='book',
+            name='subjects',
+            field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+        ),
+        migrations.AlterField(
+            model_name='edition',
+            name='parent_work',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='editions', to='bookwyrm.Work'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='name',
+            field=models.CharField(max_length=100, unique=True),
+        ),
         migrations.AlterUniqueTogether(
             name='tag',
             unique_together=set(),
diff --git a/bookwyrm/migrations/0018_auto_20201128_2142.py b/bookwyrm/migrations/0018_auto_20201128_2142.py
deleted file mode 100644
index 86d02870..00000000
--- a/bookwyrm/migrations/0018_auto_20201128_2142.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 3.0.7 on 2020-11-28 21:42
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0017_auto_20201128_1849'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='edition',
-            name='parent_work',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='editions', to='bookwyrm.Work'),
-        ),
-        migrations.AlterField(
-            model_name='tag',
-            name='name',
-            field=models.CharField(max_length=100, unique=True),
-        ),
-    ]