Resolve merge conflict in testapp migrations

2023-01-19 16:48:06 +00:00 · 2023-01-19 16:48:06 +00:00 · 716dcc2802
commit 716dcc2802
--- a/wagtail/test/testapp/migrations/0018_alter_streampage_body.py
+++ b/wagtail/test/testapp/migrations/0018_alter_streampage_body.py
@ -9,7 +9,7 @@ import wagtail.test.testapp.models
 class Migration(migrations.Migration):

    dependencies = [
-        ("tests", "0012_set_genericsnippetpage_content_type_blank"),
+        ("tests", "0017_moderatedmodel"),
    ]

    operations = [