Add migration merge b/c of confllict

data-mermaid · Mar 27, 2023 · 0de744f · 0de744f
1 parent b36c890
commit 0de744f
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py b/src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.18 on 2023-03-27 12:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_auto_20230316_1608'),
+        ('api', '0014_auto_20230322_2311'),
+    ]
+
+    operations = [
+    ]