From 60d870ca8d8190bc5f5b75959c2b1f1fe4226be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benni=20B=C3=A4rmann?= <benni.baermann@wikimedia.de>
Date: Mon, 17 May 2021 10:59:43 +0000
Subject: [PATCH] merge migrations

---
 evapp/migrations/0020_merge_20210511_1102.py | 14 ++++++++++++++
 evapp/migrations/0022_merge_20210517_1058.py | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 evapp/migrations/0020_merge_20210511_1102.py
 create mode 100644 evapp/migrations/0022_merge_20210517_1058.py

diff --git a/evapp/migrations/0020_merge_20210511_1102.py b/evapp/migrations/0020_merge_20210511_1102.py
new file mode 100644
index 0000000..77a8b3d
--- /dev/null
+++ b/evapp/migrations/0020_merge_20210511_1102.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.6 on 2021-05-11 11:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0019_auto_20210504_1333'),
+        ('evapp', '0009_auto_20210303_1115'),
+    ]
+
+    operations = [
+    ]
diff --git a/evapp/migrations/0022_merge_20210517_1058.py b/evapp/migrations/0022_merge_20210517_1058.py
new file mode 100644
index 0000000..476c71b
--- /dev/null
+++ b/evapp/migrations/0022_merge_20210517_1058.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.6 on 2021-05-17 10:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evapp', '0021_auto_20210517_1010'),
+        ('evapp', '0020_merge_20210511_1102'),
+    ]
+
+    operations = [
+    ]