fix: conflicting migrations

SELab-2 · Mar 12, 2024 · fbdec72 · fbdec72
1 parent 0db0959
commit fbdec72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/backend/api/migrations/0005_alter_project_max_score.py b/backend/api/migrations/0005_alter_project_max_score.py
diff --git a/...oups_alter_project_start_date_and_more.py → ...roups_alter_project_max_score_and_more.py b/...oups_alter_project_start_date_and_more.py → ...roups_alter_project_max_score_and_more.py
@@ -1,12 +1,12 @@
-# Generated by Django 5.0.2 on 2024-03-12 20:25
+# Generated by Django 5.0.2 on 2024-03-12 21:45
 
 import django.utils.timezone
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("api", "0005_alter_project_max_score"),
+        ("api", "0004_submission_structure_checks_passed_extrachecksresult"),
     ]
 
     operations = [
@@ -15,6 +15,11 @@ class Migration(migrations.Migration):
             name="locked_groups",
             field=models.BooleanField(default=False),
         ),
+        migrations.AlterField(
+            model_name="project",
+            name="max_score",
+            field=models.PositiveSmallIntegerField(default=20),
+        ),
         migrations.AlterField(
             model_name="project",
             name="start_date",