fix: conflicting migrations

CUCWD · Dec 11, 2023 · 73498df · 73498df
1 parent e2bd39d
commit 73498df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/common/djangoapps/student/migrations/0044_auto_20220808_2144.py b/common/djangoapps/student/migrations/0044_auto_20220808_2144.py
@@ -18,6 +18,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='userprofile',
             name='level_of_education',
-            field=models.CharField(blank=True, choices=[('p', 'Doctorate'), ('m', "Master's degree"), ('b', '4-year degree'), ('a', '2-year degree'), ('hs', 'High School or GED'), ('some-hs', 'Some high school'), ('some-college', 'Some college'), ('jd-md', 'Professional degree (J.D., M.D.)'), ('prefer-not-to-say', 'Prefer not to say')], db_index=True, max_length=25, null=True),
+            field=models.CharField(blank=True, choices=[('some-hs', 'Some high school'), ('hs', 'High School or GED'), ('some-college', 'Some college'), ('a', '2-year degree'), ('b', '4-year degree'), ('m', "Master's"), ('p', 'Doctorate'), ('jd-md', 'Professional degree (J.D., M.D.)'), ('prefer-not-to-say', 'Prefer not to say')], db_index=True, max_length=25, null=True),
+        ),
+        migrations.AddField(
+            model_name='courseenrollmentcelebration',
+            name='celebrate_weekly_goal',
+            field=models.BooleanField(default=False),
         ),
     ]
diff --git a/...n/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py b/...n/djangoapps/student/migrations/0044_courseenrollmentcelebration_celebrate_weekly_goal.py
diff --git a/common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py b/common/djangoapps/student/migrations/0046_alter_userprofile_level_of_education.py