Fix migration conflict

intuitem · Sep 13, 2024 · a9fb476 · a9fb476
1 parent a059e06
commit a9fb476
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/backend/core/migrations/0025_appliedcontrol_cost.py b/backend/core/migrations/0025_appliedcontrol_cost.py
diff --git a/backend/core/migrations/0026_appliedcontrol_cost.py b/backend/core/migrations/0026_appliedcontrol_cost.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1 on 2024-09-13 10:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0025_complianceassessment_folder_riskassessment_folder_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='appliedcontrol',
+            name='cost',
+            field=models.FloatField(help_text='Cost of the measure (using globally-chosen currency)', null=True, verbose_name='Cost'),
+        ),
+    ]