Fix migration conflicts

Amsterdam-Music-Lab · Apr 16, 2024 · 9805400 · 9805400
1 parent ce73f21
commit 9805400
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ent/migrations/0027_add_question_model.py → ...ent/migrations/0034_add_question_model.py b/...ent/migrations/0027_add_question_model.py → ...ent/migrations/0034_add_question_model.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.25 on 2024-04-11 16:31
+# Generated by Django 3.2.25 on 2024-04-16 11:06
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('experiment', '0026_auto_20240319_1114'),
+        ('experiment', '0033_rename_related'),
     ]
 
     operations = [

diff --git a/...igrations/0028_add_question_model_data.py → ...igrations/0035_add_question_model_data.py b/...igrations/0028_add_question_model_data.py → ...igrations/0035_add_question_model_data.py
@@ -15,7 +15,7 @@ def add_default_question_series(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('experiment', '0027_add_question_model'),
+        ('experiment', '0034_add_question_model'),
     ]
 
     operations = [