Merge pull request #837 from doccano/fix/migrationConflict

Add a merge migration
4 years ago · 676a37137b
1 changed files with 14 additions and 0 deletions
--- a/app/api/migrations/0003_merge_20200612_0205.py
+++ b/app/api/migrations/0003_merge_20200612_0205.py
@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2020-06-12 02:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_speech2text'),
+        ('api', '0002_project_single_class_classification'),
+    ]
+
+    operations = [
+    ]