From b9e601e700fc5aa497f8bae33d1d305ec0589bc6 Mon Sep 17 00:00:00 2001 From: Helen Root Date: Wed, 30 Oct 2024 18:57:05 +0100 Subject: [PATCH] Remake migration to avoid conflicts or additional merge migrations --- ...more.py => 0157_alter_canteen_production_type_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename data/migrations/{0144_alter_canteen_production_type_and_more.py => 0157_alter_canteen_production_type_and_more.py} (96%) diff --git a/data/migrations/0144_alter_canteen_production_type_and_more.py b/data/migrations/0157_alter_canteen_production_type_and_more.py similarity index 96% rename from data/migrations/0144_alter_canteen_production_type_and_more.py rename to data/migrations/0157_alter_canteen_production_type_and_more.py index 4afef3068..e2b386f76 100644 --- a/data/migrations/0144_alter_canteen_production_type_and_more.py +++ b/data/migrations/0157_alter_canteen_production_type_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.3 on 2024-04-30 18:18 +# Generated by Django 5.0.8 on 2024-10-30 17:50 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("data", "0143_merge_20240402_1736"), + ("data", "0156_historicalresourceaction"), ] operations = [