Fix migration conflicts

backend/core/migrations/0025_requirementassessment_answer_and_more.py → backend/core/migrations/0026_requirementassessment_answer_and_more.py

@@ -1,22 +1,23 @@
-# Generated by Django 5.1 on 2024-09-04 13:56
+# Generated by Django 5.1.1 on 2024-09-13 15:42
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ("core", "0024_appliedcontrol_owner"),
+        ('core', '0025_complianceassessment_folder_riskassessment_folder_and_more'),
     ]
 
     operations = [
         migrations.AddField(
-            model_name="requirementassessment",
-            name="answer",
-            field=models.JSONField(blank=True, null=True, verbose_name="Answer"),
+            model_name='requirementassessment',
+            name='answer',
+            field=models.JSONField(blank=True, null=True, verbose_name='Answer'),
         ),
         migrations.AddField(
-            model_name="requirementnode",
-            name="question",
-            field=models.JSONField(blank=True, null=True, verbose_name="Question"),
+            model_name='requirementnode',
+            name='question',
+            field=models.JSONField(blank=True, null=True, verbose_name='Question'),
         ),
     ]

backend/iam/migrations/0007_alter_folder_content_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-09-13 15:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iam', '0006_alter_role_folder_alter_roleassignment_folder_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='folder',
+            name='content_type',
+            field=models.CharField(choices=[('GL', 'GLOBAL'), ('DO', 'DOMAIN'), ('EN', 'ENCLAVE')], default='DO', max_length=2),
+        ),
+    ]