From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 13 Dec 2022 15:00:52 +0000 (-0800)
Subject: Resolve migration conflict
X-Git-Tag: v1.14.0-beta.rc1~109^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1875e9852eff971de89d700a59576e4546290b71;p=thirdparty%2Fpaperless-ngx.git

Resolve migration conflict
---

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 d707028e36..a05cd25556 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 = [