From 32463c115784222be82fea8e093525371bc4820e Mon Sep 17 00:00:00 2001
From: Giebisch <rafael@giebisch-mail.de>
Date: Mon, 19 Dec 2022 21:50:34 +0100
Subject: [PATCH] Fix merge

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

diff --git a/bookwyrm/migrations/0171_merge_20221219_2020.py b/bookwyrm/migrations/0171_merge_20221219_2020.py
new file mode 100644
index 000000000..0e380f828
--- /dev/null
+++ b/bookwyrm/migrations/0171_merge_20221219_2020.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.16 on 2022-12-19 20:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0167_sitesettings_import_size_limit'),
+        ('bookwyrm', '0170_merge_0168_auto_20221205_2331_0169_auto_20221206_0902'),
+    ]
+
+    operations = [
+    ]