From af0bd90c15e6743cd267372d6533041c431282a7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Apr 2024 05:57:27 -0500 Subject: [PATCH 1/2] Adds merge migration --- bookwyrm/migrations/0204_merge_20240409_1042.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0204_merge_20240409_1042.py diff --git a/bookwyrm/migrations/0204_merge_20240409_1042.py b/bookwyrm/migrations/0204_merge_20240409_1042.py new file mode 100644 index 000000000..ba7513341 --- /dev/null +++ b/bookwyrm/migrations/0204_merge_20240409_1042.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.25 on 2024-04-09 10:42 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0197_mergedauthor_mergedbook'), + ('bookwyrm', '0203_user_bookwyrm_us_is_acti_972dc4_idx'), + ] + + operations = [ + ] From 3ffbb242a4f647f1317bb7892cf73965f3035ab0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Apr 2024 05:59:01 -0500 Subject: [PATCH 2/2] Black --- bookwyrm/migrations/0204_merge_20240409_1042.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bookwyrm/migrations/0204_merge_20240409_1042.py b/bookwyrm/migrations/0204_merge_20240409_1042.py index ba7513341..5656ac586 100644 --- a/bookwyrm/migrations/0204_merge_20240409_1042.py +++ b/bookwyrm/migrations/0204_merge_20240409_1042.py @@ -6,9 +6,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0197_mergedauthor_mergedbook'), - ('bookwyrm', '0203_user_bookwyrm_us_is_acti_972dc4_idx'), + ("bookwyrm", "0197_mergedauthor_mergedbook"), + ("bookwyrm", "0203_user_bookwyrm_us_is_acti_972dc4_idx"), ] - operations = [ - ] + operations = []