merge conflicting migrations

pennlabs · Oct 15, 2024 · 32baced · 32baced
1 parent 9439212
commit 32baced
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/backend/clubs/migrations/0117_merge_20241015_1652.py b/backend/clubs/migrations/0117_merge_20241015_1652.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.4 on 2024-10-15 20:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("clubs", "0114_ownershiprequest"),
+        ("clubs", "0116_alter_club_approved_on_and_more"),
+    ]
+
+    operations = [
+    ]