From b7a7d9c0f6dc0f9727d2caedb5a990a1fa4a8f6d Mon Sep 17 00:00:00 2001
From: hexwhiz <iamsanyamgoel@gmail.com>
Date: Mon, 28 Oct 2024 11:29:29 +0530
Subject: [PATCH] fixed migration conflict

---
 .../migrations/0042_alter_issue_levelcolor.py  | 18 ++++++++++++++++++
 ...ject_mentor_project_mentor_url_and_more.py} |  2 +-
 ...cription.py => 0044_project_description.py} |  2 +-
 ...on.py => 0045_alter_project_description.py} |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 project/migrations/0042_alter_issue_levelcolor.py
 rename project/migrations/{0042_project_mentor_project_mentor_url_and_more.py => 0043_project_mentor_project_mentor_url_and_more.py} (94%)
 rename project/migrations/{0043_project_description.py => 0044_project_description.py} (85%)
 rename project/migrations/{0044_alter_project_description.py => 0045_alter_project_description.py} (88%)

diff --git a/project/migrations/0042_alter_issue_levelcolor.py b/project/migrations/0042_alter_issue_levelcolor.py
new file mode 100644
index 0000000..9f96b84
--- /dev/null
+++ 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/project/migrations/0042_project_mentor_project_mentor_url_and_more.py b/project/migrations/0043_project_mentor_project_mentor_url_and_more.py
similarity index 94%
rename from project/migrations/0042_project_mentor_project_mentor_url_and_more.py
rename to project/migrations/0043_project_mentor_project_mentor_url_and_more.py
index 0ffd040..5c40eda 100644
--- a/project/migrations/0042_project_mentor_project_mentor_url_and_more.py
+++ b/project/migrations/0043_project_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/project/migrations/0043_project_description.py b/project/migrations/0044_project_description.py
similarity index 85%
rename from project/migrations/0043_project_description.py
rename to project/migrations/0044_project_description.py
index c738e41..8d40495 100644
--- a/project/migrations/0043_project_description.py
+++ b/project/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/project/migrations/0044_alter_project_description.py b/project/migrations/0045_alter_project_description.py
similarity index 88%
rename from project/migrations/0044_alter_project_description.py
rename to project/migrations/0045_alter_project_description.py
index f76587e..a938610 100644
--- a/project/migrations/0044_alter_project_description.py
+++ b/project/migrations/0045_alter_project_description.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('project', '0043_project_description'),
+        ('project', '0044_project_description'),
     ]
 
     operations = [