Merging some migrations

Author: stefdworschak

hackathon/migrations/0018_merge_20201026_1722.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.1 on 2020-10-26 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hackathon', '0017_auto_20201025_2140'),
+        ('hackathon', '0017_auto_20201026_1312'),
+    ]
+
+    operations = [
+    ]