From 1875e9852eff971de89d700a59576e4546290b71 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 13 Dec 2022 07:00:52 -0800 Subject: [PATCH] Resolve migration conflict --- ... 1029_remove_savedview_user_correspondent_owner_and_more.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/documents/migrations/{1028_remove_savedview_user_correspondent_owner_and_more.py => 1029_remove_savedview_user_correspondent_owner_and_more.py} (97%) diff --git a/src/documents/migrations/1028_remove_savedview_user_correspondent_owner_and_more.py b/src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py similarity index 97% rename from src/documents/migrations/1028_remove_savedview_user_correspondent_owner_and_more.py rename to src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py index d707028e3..a05cd2555 100644 --- a/src/documents/migrations/1028_remove_savedview_user_correspondent_owner_and_more.py +++ b/src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("documents", "1027_remove_paperlesstask_attempted_task_and_more"), + ("documents", "1028_remove_paperlesstask_task_args_and_more"), ] operations = [