Rebase dev and fixed the conflicting migration

EBI-Metagenomics · Nov 8, 2023 · c3dc316 · c3dc316
1 parent 8967eda
commit c3dc316
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ations/0011_alter_publication_pub_type.py → ...ations/0012_alter_publication_pub_type.py b/...ations/0011_alter_publication_pub_type.py → ...ations/0012_alter_publication_pub_type.py
@@ -1,12 +1,12 @@
-# Generated by Django 3.2.18 on 2023-11-08 08:13
+# Generated by Django 3.2.18 on 2023-11-08 09:57
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('emgapi', '0010_runextraannotation'),
+        ('emgapi', '0011_analysisjob_analysis_summary_json'),
     ]
 
     operations = [