From a9f59ef8d53a7e5e3a7f3220f6991087e502298a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 19 Jan 2023 12:17:41 -0800 Subject: [PATCH 1/2] Adds merge migration --- ...0173_author_website_0174_merge_20230111_1523.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py diff --git a/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py b/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py new file mode 100644 index 000000000..02aa85ac9 --- /dev/null +++ b/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.16 on 2023-01-19 20:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0173_author_website'), + ('bookwyrm', '0174_merge_20230111_1523'), + ] + + operations = [ + ] From 9ef5d53696f131f255bef24d5319f412d94d7454 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 19 Jan 2023 13:06:58 -0800 Subject: [PATCH 2/2] Python formatting --- ...5_merge_0173_author_website_0174_merge_20230111_1523.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py b/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py index 02aa85ac9..a215076b4 100644 --- a/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py +++ b/bookwyrm/migrations/0175_merge_0173_author_website_0174_merge_20230111_1523.py @@ -6,9 +6,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0173_author_website'), - ('bookwyrm', '0174_merge_20230111_1523'), + ("bookwyrm", "0173_author_website"), + ("bookwyrm", "0174_merge_20230111_1523"), ] - operations = [ - ] + operations = []