From e7dec034c1b3019bf04c0f39bd6889ff6da257f5 Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Fri, 22 Nov 2024 08:01:01 +0100 Subject: [PATCH] Fix conflicting migrations --- ...py => 0038_asset_disaster_recovery_objectives_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename backend/core/migrations/{0037_asset_disaster_recovery_objectives_and_more.py => 0038_asset_disaster_recovery_objectives_and_more.py} (97%) diff --git a/backend/core/migrations/0037_asset_disaster_recovery_objectives_and_more.py b/backend/core/migrations/0038_asset_disaster_recovery_objectives_and_more.py similarity index 97% rename from backend/core/migrations/0037_asset_disaster_recovery_objectives_and_more.py rename to backend/core/migrations/0038_asset_disaster_recovery_objectives_and_more.py index 52f795352..6045b5ff6 100644 --- a/backend/core/migrations/0037_asset_disaster_recovery_objectives_and_more.py +++ b/backend/core/migrations/0038_asset_disaster_recovery_objectives_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.1.1 on 2024-11-20 18:29 +# Generated by Django 5.1.1 on 2024-11-22 07:00 import core.validators from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("core", "0036_asset_owner"), + ("core", "0037_appliedcontrol_priority"), ] operations = [