fix conflict migration

gustavomm19 · Sep 22, 2023 · 3b31289 · 3b31289
1 parent e50e5cb
commit 3b31289
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/breathecode/payments/migrations/0035_merge_20230922_2320.py b/breathecode/payments/migrations/0035_merge_20230922_2320.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.21 on 2023-09-22 23:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payments', '0033_serviceitemfeature_title'),
+        ('payments', '0034_cohortset_cohorts'),
+    ]
+
+    operations = []