From 71459b2d58e2cfea5bc5a0619f349148fbba990f Mon Sep 17 00:00:00 2001 From: faucomte97 Date: Thu, 1 Aug 2024 10:49:39 +0100 Subject: [PATCH] Resolve migration conflicts --- ...{0053_delete_aimmo_models.py => 0054_delete_aimmo_models.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename cfl_common/common/migrations/{0053_delete_aimmo_models.py => 0054_delete_aimmo_models.py} (89%) diff --git a/cfl_common/common/migrations/0053_delete_aimmo_models.py b/cfl_common/common/migrations/0054_delete_aimmo_models.py similarity index 89% rename from cfl_common/common/migrations/0053_delete_aimmo_models.py rename to cfl_common/common/migrations/0054_delete_aimmo_models.py index 438d95139..c9956e5c0 100644 --- a/cfl_common/common/migrations/0053_delete_aimmo_models.py +++ b/cfl_common/common/migrations/0054_delete_aimmo_models.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('common', '0052_add_cse_fields'), + ('common', '0053_clean_class_data'), ] operations = [