From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 3 Feb 2023 22:25:22 +0000 (-0800)
Subject: Resolve migration conflicts
X-Git-Tag: v1.14.0-beta.rc1~109^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e83c94832c33fdce058bb3d3a0592379f2a3074;p=thirdparty%2Fpaperless-ngx.git

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 81f94175c3..b187871e75 100644
--- 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 = [