From 23e05ce20e8a4bd665fee44cfb0914c2898089c0 Mon Sep 17 00:00:00 2001 From: Dana Lambert Date: Fri, 10 Dec 2021 09:10:18 +1300 Subject: [PATCH] Fix fixture conflicts --- .../{0010_christchurchregion.py => 0011_christchurchregion.py} | 2 +- ...1_alter_plant_maxheight.py => 0012_alter_plant_maxheight.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename backend/right_tree/api/migrations/{0010_christchurchregion.py => 0011_christchurchregion.py} (93%) rename backend/right_tree/api/migrations/{0011_alter_plant_maxheight.py => 0012_alter_plant_maxheight.py} (88%) diff --git a/backend/right_tree/api/migrations/0010_christchurchregion.py b/backend/right_tree/api/migrations/0011_christchurchregion.py similarity index 93% rename from backend/right_tree/api/migrations/0010_christchurchregion.py rename to backend/right_tree/api/migrations/0011_christchurchregion.py index 917537e..29651cb 100644 --- a/backend/right_tree/api/migrations/0010_christchurchregion.py +++ b/backend/right_tree/api/migrations/0011_christchurchregion.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('api', '0009_alter_plant_options'), + ('api', '0010_auto_20211201_2155'), ] operations = [ diff --git a/backend/right_tree/api/migrations/0011_alter_plant_maxheight.py b/backend/right_tree/api/migrations/0012_alter_plant_maxheight.py similarity index 88% rename from backend/right_tree/api/migrations/0011_alter_plant_maxheight.py rename to backend/right_tree/api/migrations/0012_alter_plant_maxheight.py index e95b64f..78f9ef4 100644 --- a/backend/right_tree/api/migrations/0011_alter_plant_maxheight.py +++ b/backend/right_tree/api/migrations/0012_alter_plant_maxheight.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('api', '0010_christchurchregion'), + ('api', '0011_christchurchregion'), ] operations = [