From 6482febcddaecffd8b1da514d5ec73b0a1004459 Mon Sep 17 00:00:00 2001
From: sandyr <sandyr@ebi.ac.uk>
Date: Thu, 21 Sep 2023 09:43:36 +0100
Subject: [PATCH] resolve migration conflicts

---
 ...4_0716.py => 0012_suppression_reason_ancestor_suppressed.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename emgapi/migrations/{0011_auto_20230914_0716.py => 0012_suppression_reason_ancestor_suppressed.py} (97%)

diff --git a/emgapi/migrations/0011_auto_20230914_0716.py b/emgapi/migrations/0012_suppression_reason_ancestor_suppressed.py
similarity index 97%
rename from emgapi/migrations/0011_auto_20230914_0716.py
rename to emgapi/migrations/0012_suppression_reason_ancestor_suppressed.py
index 1bc01b352..b0b6fd659 100644
--- a/emgapi/migrations/0011_auto_20230914_0716.py
+++ b/emgapi/migrations/0012_suppression_reason_ancestor_suppressed.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('emgapi', '0010_runextraannotation'),
+        ('emgapi', '0011_analysisjob_analaysis_summary_json'),
     ]
 
     operations = [