From a176c6cd35c897d69ef418fb9438e0be7b832a7e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 12 Dec 2020 09:38:05 -0800
Subject: [PATCH] Creates merge migration

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

diff --git a/bookwyrm/migrations/0021_merge_20201212_1737.py b/bookwyrm/migrations/0021_merge_20201212_1737.py
new file mode 100644
index 00000000..4ccf8c8c
--- /dev/null
+++ b/bookwyrm/migrations/0021_merge_20201212_1737.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-12-12 17:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0020_auto_20201208_0213'),
+        ('bookwyrm', '0016_auto_20201211_2026'),
+    ]
+
+    operations = [
+    ]