fix merge conflict

gcivil-nyu-org · Nov 14, 2023 · 1df010d · 1df010d
1 parent 345623d
commit 1df010d
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/events/migrations/0007_merge_20231114_1803.py b/events/migrations/0007_merge_20231114_1803.py
@@ -0,0 +1,12 @@
+# Generated by Django 4.2.6 on 2023-11-14 23:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("events", "0004_event_description"),
+        ("events", "0006_alter_comment_is_active"),
+    ]
+
+    operations = []