From d1d339225cf35f2bf7bccf3d29383663bfb38632 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 16 Oct 2020 17:11:17 -0700
Subject: [PATCH] Merge migrations

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

diff --git a/bookwyrm/migrations/0055_merge_20201017_0011.py b/bookwyrm/migrations/0055_merge_20201017_0011.py
new file mode 100644
index 000000000..fd995eaa8
--- /dev/null
+++ b/bookwyrm/migrations/0055_merge_20201017_0011.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-10-17 00:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0054_auto_20201016_1707'),
+        ('bookwyrm', '0054_auto_20201016_2359'),
+    ]
+
+    operations = [
+    ]