From 108981a226719a041056a8282c49d57be3c1a761 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 16 Mar 2022 16:35:03 -0700
Subject: [PATCH] Creates fresh migration and removes merges

---
 bookwyrm/migrations/0142_merge_20220225_2103.py     | 13 -------------
 bookwyrm/migrations/0145_merge_20220312_1040.py     | 13 -------------
 ...topped_reading.py => 0146_auto_20220316_2320.py} |  6 +++---
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 bookwyrm/migrations/0142_merge_20220225_2103.py
 delete mode 100644 bookwyrm/migrations/0145_merge_20220312_1040.py
 rename bookwyrm/migrations/{0134_alter_stopped_reading.py => 0146_auto_20220316_2320.py} (95%)

diff --git a/bookwyrm/migrations/0142_merge_20220225_2103.py b/bookwyrm/migrations/0142_merge_20220225_2103.py
deleted file mode 100644
index 62f8dcfe..00000000
--- a/bookwyrm/migrations/0142_merge_20220225_2103.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by Django 3.2.12 on 2022-02-25 21:03
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0134_alter_stopped_reading"),
-        ("bookwyrm", "0141_alter_report_status"),
-    ]
-
-    operations = []
diff --git a/bookwyrm/migrations/0145_merge_20220312_1040.py b/bookwyrm/migrations/0145_merge_20220312_1040.py
deleted file mode 100644
index 8e6c75ac..00000000
--- a/bookwyrm/migrations/0145_merge_20220312_1040.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by Django 3.2.12 on 2022-03-12 10:40
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0142_merge_20220225_2103"),
-        ("bookwyrm", "0144_alter_announcement_display_type"),
-    ]
-
-    operations = []
diff --git a/bookwyrm/migrations/0134_alter_stopped_reading.py b/bookwyrm/migrations/0146_auto_20220316_2320.py
similarity index 95%
rename from bookwyrm/migrations/0134_alter_stopped_reading.py
rename to bookwyrm/migrations/0146_auto_20220316_2320.py
index ba49f612..e50bf25e 100644
--- a/bookwyrm/migrations/0134_alter_stopped_reading.py
+++ b/bookwyrm/migrations/0146_auto_20220316_2320.py
@@ -1,7 +1,7 @@
-# Generated by Django 3.2.11 on 2022-02-11 13:19
+# Generated by Django 3.2.12 on 2022-03-16 23:20
 
-from django.db import migrations
 import bookwyrm.models.fields
+from django.db import migrations
 from bookwyrm.models import Shelf
 
 
@@ -27,7 +27,7 @@ def add_shelves(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookwyrm", "0133_alter_listitem_notes"),
+        ("bookwyrm", "0145_sitesettings_version"),
     ]
 
     operations = [