From 5fc7c150397f97715a61d91d5406cc5ac68dab89 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 24 Jan 2023 14:23:01 -0800 Subject: [PATCH] Fix conflicting migrations from `dev` --- ...030_remove_savedview_user_correspondent_owner_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/documents/migrations/{1029_remove_savedview_user_correspondent_owner_and_more.py => 1030_remove_savedview_user_correspondent_owner_and_more.py} (95%) diff --git a/src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py b/src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py similarity index 95% rename from src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py rename to src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py index a05cd2555..81f94175c 100644 --- a/src/documents/migrations/1029_remove_savedview_user_correspondent_owner_and_more.py +++ b/src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.3 on 2022-12-06 04:48 +# Generated by Django 4.1.4 on 2022-01-24 04:48 from django.conf import settings from django.db import migrations, models @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("documents", "1028_remove_paperlesstask_task_args_and_more"), + ("documents", "1029_alter_document_archive_serial_number"), ] operations = [