Merge pull request #155 from opencdms/fix/migration-conflict

rectified migration merge conflict issue
opencdms · Oct 9, 2024 · 8084028 · 8084028
2 parents ff9901a + 85553d6
commit 8084028
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/wx/migrations/0028_auto_20240928_0243.py → api/wx/migrations/0029_auto_20240928_0243.py b/api/wx/migrations/0028_auto_20240928_0243.py → api/wx/migrations/0029_auto_20240928_0243.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wx', '0027_auto_20230725_0352'),
+        ('wx', '0028_auto_20240814_1808'),
     ]
 
     operations = [

diff --git a/api/wx/migrations/0030_auto_20240830_2025.py b/api/wx/migrations/0030_auto_20240830_2025.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wx', '0029_variable_synoptic_code_form'),
+        ('wx', '0029_auto_20240928_0243'),
     ]
 
     operations = [

diff --git a/...tions/0029_variable_synoptic_code_form.py → ...tions/0031_variable_synoptic_code_form.py b/...tions/0029_variable_synoptic_code_form.py → ...tions/0031_variable_synoptic_code_form.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wx', '0028_auto_20240814_1808'),
+        ('wx', '0030_auto_20240830_2025'),
     ]
 
     operations = [