fixed migration conflict

ContriHUB · Oct 28, 2024 · b7a7d9c · b7a7d9c
1 parent 1cdd6fa
commit b7a7d9c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/project/migrations/0042_alter_issue_levelcolor.py b/project/migrations/0042_alter_issue_levelcolor.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1 on 2024-10-24 16:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0041_issue_levelcolor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='issue',
+            name='levelcolor',
+            field=models.PositiveSmallIntegerField(choices=[(0, '#f2f2f2'), (4, '#39c0ed'), (1, '#00b74a'), (2, '#ffa900'), (3, '#f93154')], default=1, verbose_name='Level Color'),
+        ),
+    ]
diff --git a/...ect_mentor_project_mentor_url_and_more.py → ...ect_mentor_project_mentor_url_and_more.py b/...ect_mentor_project_mentor_url_and_more.py → ...ect_mentor_project_mentor_url_and_more.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('project', '0041_issue_levelcolor'),
+        ('project', '0042_alter_issue_levelcolor'),
     ]
 
     operations = [

diff --git a/...ct/migrations/0043_project_description.py → ...ct/migrations/0044_project_description.py b/...ct/migrations/0043_project_description.py → ...ct/migrations/0044_project_description.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('project', '0042_project_mentor_project_mentor_url_and_more'),
+        ('project', '0043_project_mentor_project_mentor_url_and_more'),
     ]
 
     operations = [

diff --git a/...rations/0044_alter_project_description.py → ...rations/0045_alter_project_description.py b/...rations/0044_alter_project_description.py → ...rations/0045_alter_project_description.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('project', '0043_project_description'),
+        ('project', '0044_project_description'),
     ]
 
     operations = [