From d05dea758986afb2ae6747f07298483fafd4b402 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 26 Apr 2024 07:33:11 -0700
Subject: [PATCH] Fix migration merge conflict

---
 ...rule_type.py => 1048_alter_savedviewfilterrule_rule_type.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/documents/migrations/{1047_alter_savedviewfilterrule_rule_type.py => 1048_alter_savedviewfilterrule_rule_type.py} (96%)

diff --git a/src/documents/migrations/1047_alter_savedviewfilterrule_rule_type.py b/src/documents/migrations/1048_alter_savedviewfilterrule_rule_type.py
similarity index 96%
rename from src/documents/migrations/1047_alter_savedviewfilterrule_rule_type.py
rename to src/documents/migrations/1048_alter_savedviewfilterrule_rule_type.py
index c2adcee5d..dc4d0bf1c 100644
--- a/src/documents/migrations/1047_alter_savedviewfilterrule_rule_type.py
+++ b/src/documents/migrations/1048_alter_savedviewfilterrule_rule_type.py
@@ -7,7 +7,7 @@ from django.db import models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("documents", "1046_workflowaction_remove_all_correspondents_and_more"),
+        ("documents", "1047_savedview_display_mode_and_more"),
     ]
 
     operations = [