resolves migration file conflict, destructivly

Samfundet · Nov 3, 2024 · 3672d88 · 3672d88
1 parent 84c4b1f
commit 3672d88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/backend/samfundet/migrations/0009_alter_recruitmentapplication_recruiter_priority.py b/backend/samfundet/migrations/0009_alter_recruitmentapplication_recruiter_priority.py
diff --git a/...pplication_applicant_priority_and_more.py → ...pplication_applicant_priority_and_more.py b/...pplication_applicant_priority_and_more.py → ...pplication_applicant_priority_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1.1 on 2024-11-02 21:46
+# Generated by Django 5.1.1 on 2024-11-03 01:16
 
 import django.db.models.deletion
 from django.conf import settings
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('samfundet', '0007_alter_infobox_color_alter_infobox_image_and_more'),
+        ('samfundet', '0010_recruitment_promo_media'),
     ]
 
     operations = [
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='recruitmentapplication',
             name='recruiter_priority',
-            field=models.IntegerField(choices=[(0, 'Not Set'), (1, 'Reserve'), (2, 'Wanted'), (3, 'Not Wanted')], default=0, help_text="Recruiter's priority for this application."),
+            field=models.IntegerField(choices=[(0, 'Not Set'), (1, 'Reserve'), (2, 'Wanted'), (3, 'Not Wanted')], default=0, help_text="Recruiter's priority for this application - should not be visible to applicant"),
         ),
         migrations.AlterField(
             model_name='recruitmentapplication',