From 118da0cf6da1269526f91cb1dcf68644de2ea306 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 22 Oct 2025 22:02:14 -0700 Subject: [PATCH] Resolve migration conflict --- ...stask_task_name.py => 1074_alter_paperlesstask_task_name.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/documents/migrations/{1073_alter_paperlesstask_task_name.py => 1074_alter_paperlesstask_task_name.py} (91%) diff --git a/src/documents/migrations/1073_alter_paperlesstask_task_name.py b/src/documents/migrations/1074_alter_paperlesstask_task_name.py similarity index 91% rename from src/documents/migrations/1073_alter_paperlesstask_task_name.py rename to src/documents/migrations/1074_alter_paperlesstask_task_name.py index f058556a3..b27c25634 100644 --- a/src/documents/migrations/1073_alter_paperlesstask_task_name.py +++ b/src/documents/migrations/1074_alter_paperlesstask_task_name.py @@ -6,7 +6,7 @@ from django.db import models class Migration(migrations.Migration): dependencies = [ - ("documents", "1072_workflowtrigger_filter_custom_field_query_and_more"), + ("documents", "1073_migrate_workflow_title_jinja"), ] operations = [