From af823cf6458090e343c0b7b8f471a5d38873b187 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 15 Dec 2020 17:53:20 -0800
Subject: [PATCH] Merge migration

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

diff --git a/bookwyrm/migrations/0023_merge_20201216_0112.py b/bookwyrm/migrations/0023_merge_20201216_0112.py
new file mode 100644
index 00000000..e3af4849
--- /dev/null
+++ b/bookwyrm/migrations/0023_merge_20201216_0112.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-12-16 01:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0017_auto_20201212_0059'),
+        ('bookwyrm', '0022_auto_20201212_1744'),
+    ]
+
+    operations = [
+    ]