From cd5b18ca1a04dbac42c89a5cd6b0f4c7b4b6a677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Tue, 11 Jul 2023 16:37:04 +0200
Subject: [PATCH] Fix migrations

---
 district/migrations/0117_merge_20230711_1636.py | 12 ++++++++++++
 uniweb/migrations/0046_merge_20230711_1636.py   | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 district/migrations/0117_merge_20230711_1636.py
 create mode 100644 uniweb/migrations/0046_merge_20230711_1636.py

diff --git a/district/migrations/0117_merge_20230711_1636.py b/district/migrations/0117_merge_20230711_1636.py
new file mode 100644
index 00000000..d996b53a
--- /dev/null
+++ b/district/migrations/0117_merge_20230711_1636.py
@@ -0,0 +1,12 @@
+# Generated by Django 4.1.8 on 2023-07-11 14:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("district", "0109_districtcalendarpage_and_more"),
+        ("district", "0116_merge_20230711_1609"),
+    ]
+
+    operations = []
diff --git a/uniweb/migrations/0046_merge_20230711_1636.py b/uniweb/migrations/0046_merge_20230711_1636.py
new file mode 100644
index 00000000..43f22781
--- /dev/null
+++ b/uniweb/migrations/0046_merge_20230711_1636.py
@@ -0,0 +1,12 @@
+# Generated by Django 4.1.8 on 2023-07-11 14:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("uniweb", "0042_uniwebcalendarpage_uniwebhomepage_calendar_page"),
+        ("uniweb", "0045_merge_20230711_1623"),
+    ]
+
+    operations = []
-- 
GitLab