From b9576ccd315652eccad7c01e4b7871c7aeaeb39e Mon Sep 17 00:00:00 2001 From: Giebisch Date: Wed, 11 Jan 2023 16:23:20 +0100 Subject: [PATCH] Merge conflict fix --- bookwyrm/migrations/0174_merge_20230111_1523.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0174_merge_20230111_1523.py diff --git a/bookwyrm/migrations/0174_merge_20230111_1523.py b/bookwyrm/migrations/0174_merge_20230111_1523.py new file mode 100644 index 000000000..982d9ab6f --- /dev/null +++ b/bookwyrm/migrations/0174_merge_20230111_1523.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.16 on 2023-01-11 15:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0173_auto_20221228_1436"), + ("bookwyrm", "0173_merge_20230102_1444"), + ] + + operations = []