Resolve merge migration conflict

ziadhany · ziadhany · commit aa5cb24dafab · 2026-04-30T16:31:13.000+03:00
Signed-off-by: ziad hany &lt;ziadhany2016@gmail.com&gt;
diff --git a/vulnerabilities/migrations/0124_advisoryv2_remove_malformed_aliases_and_dvisory_id.py b/vulnerabilities/migrations/0124_advisoryv2_remove_malformed_aliases_and_dvisory_id.py
@@ -4,7 +4,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("vulnerabilities", "0121_advisoryv2_is_latest_alter_advisoryv2_advisory_id_and_more"),
+        ("vulnerabilities", "0123_alter_packagev2_options_alter_packagev2_package_url_and_more"),
     ]
 
     def drop_malformed_advisory_v2(apps, _):
diff --git a/vulnerabilities/tests/test_data_migrations.py b/vulnerabilities/tests/test_data_migrations.py
@@ -1093,8 +1093,8 @@ def test_latest_is_actually_recent(self):
 
 class TestMalformedAliasesAVIDMigration(TestMigrations):
     app_name = "vulnerabilities"
-    migrate_from = "0121_advisoryv2_is_latest_alter_advisoryv2_advisory_id_and_more"
-    migrate_to = "0122_advisoryv2_remove_malformed_aliases_and_dvisory_id"
+    migrate_from = "0123_alter_packagev2_options_alter_packagev2_package_url_and_more"
+    migrate_to = "0124_advisoryv2_remove_malformed_aliases_and_dvisory_id"
     raw_alias_inputs = [
         ("CVE-2023-1111", True),
         ("GHSA-abcd-1234", True),

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class Migration(migrations.Migration):`
`6`	`6`	`dependencies = [`
`7`		`- ("vulnerabilities", "0121_advisoryv2_is_latest_alter_advisoryv2_advisory_id_and_more"),`
	`7`	`+ ("vulnerabilities", "0123_alter_packagev2_options_alter_packagev2_package_url_and_more"),`
`8`	`8`	`]`
`9`	`9`
`10`	`10`	`def drop_malformed_advisory_v2(apps, _):`