From 8512308b2af212548dc506d007f8f938083a7213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Riku=20Kestila=CC=88?= Date: Tue, 9 Jan 2024 11:36:41 +0200 Subject: [PATCH] fix: conflicting migrations --- ..._by_talpa_status.py => 0049_add_rejected_by_talpa_status.py} | 2 +- ...ionbatch_status.py => 0050_alter_applicationbatch_status.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename backend/benefit/applications/migrations/{0048_add_rejected_by_talpa_status.py => 0049_add_rejected_by_talpa_status.py} (97%) rename backend/benefit/applications/migrations/{0049_alter_applicationbatch_status.py => 0050_alter_applicationbatch_status.py} (92%) diff --git a/backend/benefit/applications/migrations/0048_add_rejected_by_talpa_status.py b/backend/benefit/applications/migrations/0049_add_rejected_by_talpa_status.py similarity index 97% rename from backend/benefit/applications/migrations/0048_add_rejected_by_talpa_status.py rename to backend/benefit/applications/migrations/0049_add_rejected_by_talpa_status.py index 4af6a129d8..c0263eb506 100644 --- a/backend/benefit/applications/migrations/0048_add_rejected_by_talpa_status.py +++ b/backend/benefit/applications/migrations/0049_add_rejected_by_talpa_status.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('applications', '0047_remove_phone_number_restriction'), + ('applications', '0048_alter_attachment_attachment_type'), ] operations = [ diff --git a/backend/benefit/applications/migrations/0049_alter_applicationbatch_status.py b/backend/benefit/applications/migrations/0050_alter_applicationbatch_status.py similarity index 92% rename from backend/benefit/applications/migrations/0049_alter_applicationbatch_status.py rename to backend/benefit/applications/migrations/0050_alter_applicationbatch_status.py index de9d2b2c4f..154706f7bf 100644 --- a/backend/benefit/applications/migrations/0049_alter_applicationbatch_status.py +++ b/backend/benefit/applications/migrations/0050_alter_applicationbatch_status.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('applications', '0048_add_rejected_by_talpa_status'), + ('applications', '0049_add_rejected_by_talpa_status'), ] operations = [