From 6d1de44c482aad36dc1622caab3d0d1c2bab1cf8 Mon Sep 17 00:00:00 2001
From: Giebisch <rafael@giebisch-mail.de>
Date: Mon, 2 Jan 2023 17:38:43 +0100
Subject: [PATCH] Sync with main and merge migrations

---
 bookwyrm/migrations/0171_merge_20221219_2020.py |  7 +++----
 bookwyrm/migrations/0173_merge_20230102_1444.py | 13 +++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/migrations/0173_merge_20230102_1444.py

diff --git a/bookwyrm/migrations/0171_merge_20221219_2020.py b/bookwyrm/migrations/0171_merge_20221219_2020.py
index 0e380f828..53d44872f 100644
--- a/bookwyrm/migrations/0171_merge_20221219_2020.py
+++ b/bookwyrm/migrations/0171_merge_20221219_2020.py
@@ -6,9 +6,8 @@ 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'),
+        ("bookwyrm", "0167_sitesettings_import_size_limit"),
+        ("bookwyrm", "0170_merge_0168_auto_20221205_2331_0169_auto_20221206_0902"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0173_merge_20230102_1444.py b/bookwyrm/migrations/0173_merge_20230102_1444.py
new file mode 100644
index 000000000..c3e37a76f
--- /dev/null
+++ b/bookwyrm/migrations/0173_merge_20230102_1444.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.16 on 2023-01-02 14:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0171_merge_20221219_2020"),
+        ("bookwyrm", "0172_alter_user_preferred_language"),
+    ]
+
+    operations = []