From 7fae4e2d7877ce9a99edc590891181fd97a73ac7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 5 Jun 2026 23:40:20 +0000 Subject: [PATCH] Fix migration conflicts --- .../{0059_remove_build_notes.py => 0060_remove_build_notes.py} | 2 +- .../InvenTree/common/migrations/0045_auto_20260525_0956.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/backend/InvenTree/build/migrations/{0059_remove_build_notes.py => 0060_remove_build_notes.py} (88%) diff --git a/src/backend/InvenTree/build/migrations/0059_remove_build_notes.py b/src/backend/InvenTree/build/migrations/0060_remove_build_notes.py similarity index 88% rename from src/backend/InvenTree/build/migrations/0059_remove_build_notes.py rename to src/backend/InvenTree/build/migrations/0060_remove_build_notes.py index fff4c5c18a..f7f7fb1ee9 100644 --- a/src/backend/InvenTree/build/migrations/0059_remove_build_notes.py +++ b/src/backend/InvenTree/build/migrations/0060_remove_build_notes.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ("build", "0058_buildline_consumed"), + ("build", "0059_build_tags"), ("common", "0046_remove_notesimage_model_id_and_more") ] diff --git a/src/backend/InvenTree/common/migrations/0045_auto_20260525_0956.py b/src/backend/InvenTree/common/migrations/0045_auto_20260525_0956.py index 251bfca76b..896e3106b6 100644 --- a/src/backend/InvenTree/common/migrations/0045_auto_20260525_0956.py +++ b/src/backend/InvenTree/common/migrations/0045_auto_20260525_0956.py @@ -122,7 +122,7 @@ class Migration(migrations.Migration): # Ensure that each app which supports 'notes' is up-to-date first dependencies = [ - ("build", "0058_buildline_consumed"), + ("build", "0059_build_tags"), ("common", "0044_note"), ("company", "0079_auto_20260212_1054"), ("order", "0119_transferorderlineitem_line_int"),