Merge pull request #792 from maykinmedia/fix/migration-conflict

Resolved migrations conflict
maykinmedia · Sep 28, 2023 · 380ecd7 · 380ecd7
2 parents 635d3de + 94b38af
commit 380ecd7
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/open_inwoner/configurations/migrations/0053_merge_20230928_1457.py b/src/open_inwoner/configurations/migrations/0053_merge_20230928_1457.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.20 on 2023-09-28 12:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("configurations", "0052_siteconfiguration_registration_text"),
+        ("configurations", "0052_siteconfiguration_search_filters"),
+    ]
+
+    operations = []