address migration conflict

CentreForDigitalHumanities · Nov 21, 2024 · 49e1609 · 49e1609
1 parent 246d622
commit 49e1609
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/backend/addcorpus/migrations/0025_merge_20241121_1525.py b/backend/addcorpus/migrations/0025_merge_20241121_1525.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.2.16 on 2024-11-21 14:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('addcorpus', '0024_field_position'),
+        ('addcorpus', '0024_remove_field_name_ner_validator'),
+    ]
+
+    operations = [
+    ]