From 754a4c2e742b0ecf8b6e8eeb079a249b8ef3c8f4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 24 May 2026 09:42:19 +0000 Subject: [PATCH] Fix migration conflict --- .../InvenTree/common/migrations/{0042_note.py => 0044_note.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/backend/InvenTree/common/migrations/{0042_note.py => 0044_note.py} (98%) diff --git a/src/backend/InvenTree/common/migrations/0042_note.py b/src/backend/InvenTree/common/migrations/0044_note.py similarity index 98% rename from src/backend/InvenTree/common/migrations/0042_note.py rename to src/backend/InvenTree/common/migrations/0044_note.py index 409eec9f5c..68ff194a47 100644 --- a/src/backend/InvenTree/common/migrations/0042_note.py +++ b/src/backend/InvenTree/common/migrations/0044_note.py @@ -9,7 +9,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("common", "0041_auto_20251203_1244"), + ("common", "0043_auto_20260518_1206"), ("contenttypes", "0002_remove_content_type_name"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ]