From 824d087130db8ce6bf5cf168509b7ef5468ec003 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:42:10 -0800 Subject: [PATCH] Fix migrations merge conflict --- ...1058_workflowtrigger_schedule_date_custom_field_and_more.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/documents/migrations/{1057_workflowtrigger_schedule_date_custom_field_and_more.py => 1058_workflowtrigger_schedule_date_custom_field_and_more.py} (98%) diff --git a/src/documents/migrations/1057_workflowtrigger_schedule_date_custom_field_and_more.py b/src/documents/migrations/1058_workflowtrigger_schedule_date_custom_field_and_more.py similarity index 98% rename from src/documents/migrations/1057_workflowtrigger_schedule_date_custom_field_and_more.py rename to src/documents/migrations/1058_workflowtrigger_schedule_date_custom_field_and_more.py index fa3e68100..05d38578a 100644 --- a/src/documents/migrations/1057_workflowtrigger_schedule_date_custom_field_and_more.py +++ b/src/documents/migrations/1058_workflowtrigger_schedule_date_custom_field_and_more.py @@ -9,7 +9,7 @@ from django.db import models class Migration(migrations.Migration): dependencies = [ - ("documents", "1056_customfieldinstance_deleted_at_and_more"), + ("documents", "1057_paperlesstask_owner"), ] operations = [