[#245] Resolved conflict with migrations

cpmonitor/migrations/0028_merge_20230827_1442.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.1.7 on 2023-08-27 12:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "cpmonitor",
+            "0026_alter_task_options_alter_city_assessment_action_plan_and_more",
+        ),
+        ("cpmonitor", "0027_invitation"),
+    ]
+
+    operations = []