From 5d8404f79728cae1a0d59f4b6f773d6445a2507a Mon Sep 17 00:00:00 2001
From: Thomas Versteeg <t@versteeg.email>
Date: Sat, 12 Mar 2022 11:45:09 +0100
Subject: [PATCH] Add merge migration

---
 bookwyrm/migrations/0145_merge_20220312_1040.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bookwyrm/migrations/0145_merge_20220312_1040.py

diff --git a/bookwyrm/migrations/0145_merge_20220312_1040.py b/bookwyrm/migrations/0145_merge_20220312_1040.py
new file mode 100644
index 000000000..3fa131c44
--- /dev/null
+++ b/bookwyrm/migrations/0145_merge_20220312_1040.py
@@ -0,0 +1,14 @@
+# 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 = [
+    ]