From 2b1d647c858a3a5d8b5e69ff1a453c1a9bd9c39c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 4 Aug 2021 10:46:56 -0700
Subject: [PATCH] Adds merge migration

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

diff --git a/bookwyrm/migrations/0079_merge_20210804_1746.py b/bookwyrm/migrations/0079_merge_20210804_1746.py
new file mode 100644
index 00000000..315733a3
--- /dev/null
+++ b/bookwyrm/migrations/0079_merge_20210804_1746.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.4 on 2021-08-04 17:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0046_user_default_post_privacy'),
+        ('bookwyrm', '0078_add_shelved_date'),
+    ]
+
+    operations = [
+    ]