Resolve migration conflicts

diff --git a/src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py b/src/documents/migrations/1031_remove_savedview_user_correspondent_owner_and_more.py
similarity index 95%
rename from src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py
rename to src/documents/migrations/1031_remove_savedview_user_correspondent_owner_and_more.py
index 81f94175c3dd0b0805697b84d33d29587bf12167..b187871e759586f30af8c9a9a0d057f56f9e45f8 100644 (file)
--- a/src/documents/migrations/1030_remove_savedview_user_correspondent_owner_and_more.py
+++ b/src/documents/migrations/1031_remove_savedview_user_correspondent_owner_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.4 on 2022-01-24 04:48
+# Generated by Django 4.1.4 on 2022-02-03 04:24
 
 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", "1029_alter_document_archive_serial_number"),
+        ("documents", "1030_alter_paperlesstask_task_file_name"),
     ]
 
     operations = [