From 5809f6ecd0189df7809fed41c43a7eaa5c9e73e3 Mon Sep 17 00:00:00 2001 From: La-Cezanne Date: Sun, 27 Aug 2023 14:53:30 +0200 Subject: [PATCH] [#245] Resolved conflict with migrations --- cpmonitor/migrations/0028_merge_20230827_1442.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 cpmonitor/migrations/0028_merge_20230827_1442.py diff --git a/cpmonitor/migrations/0028_merge_20230827_1442.py b/cpmonitor/migrations/0028_merge_20230827_1442.py new file mode 100644 index 00000000..ef578d8e --- /dev/null +++ b/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 = []