merge migrations

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 = [
+    ]

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 = [
+    ]