Resolved migration conflicts

HyphaApp · Oct 18, 2024 · 97a5ba4 · 97a5ba4
1 parent 9455f68
commit 97a5ba4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...tdocumentcategory_document_access_view.py → ...tdocumentcategory_document_access_view.py b/...tdocumentcategory_document_access_view.py → ...tdocumentcategory_document_access_view.py
@@ -1,12 +1,12 @@
-# Generated by Django 4.2.15 on 2024-09-23 11:16
+# Generated by Django 4.2.16 on 2024-10-18 14:29
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
         ("auth", "0012_alter_user_first_name_max_length"),
-        ("application_projects", "0087_alter_pafreviewersrole_user_roles"),
+        ("application_projects", "0088_remove_duediligencedocument_vendor_and_more"),
     ]
 
     operations = [

diff --git a/...cts/migrations/0089_auto_20240923_1154.py → ...cts/migrations/0090_auto_20241018_1430.py b/...cts/migrations/0089_auto_20240923_1154.py → ...cts/migrations/0090_auto_20241018_1430.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.15 on 2024-09-23 11:54
+# Generated by Django 4.2.16 on 2024-10-18 14:30
 
 from django.db import migrations
 from hypha.apply.users.groups import GROUPS_ORG_FACULTY
@@ -18,7 +18,7 @@ def allow_internal_groups_to_contractdocumentcategory(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("application_projects", "0088_contractdocumentcategory_document_access_view"),
+        ("application_projects", "0089_contractdocumentcategory_document_access_view"),
     ]
 
     operations = [