Fix migration conflicts

newamericafoundation · Mar 20, 2024 · fa57f4f · fa57f4f
1 parent 29b24db
commit fa57f4f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.../0007_specify_heading_levels_in_labels.py → .../0008_specify_heading_levels_in_labels.py b/.../0007_specify_heading_levels_in_labels.py → .../0008_specify_heading_levels_in_labels.py
@@ -12,7 +12,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('collection', '0006_alter_collection_body'),
+        ('collection', '0007_alter_collection_body'),
     ]
 
     operations = [

diff --git a/.../0063_specify_heading_levels_in_labels.py → .../0064_specify_heading_levels_in_labels.py b/.../0063_specify_heading_levels_in_labels.py → .../0064_specify_heading_levels_in_labels.py
@@ -12,7 +12,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('home', '0062_remove_legacy_subscribe_page_models'),
+        ('home', '0063_auto_20240308_1840'),
     ]
 
     operations = [

diff --git a/.../0037_specify_heading_levels_in_labels.py → .../0038_specify_heading_levels_in_labels.py b/.../0037_specify_heading_levels_in_labels.py → .../0038_specify_heading_levels_in_labels.py
@@ -12,7 +12,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('in_depth', '0036_auto_20230609_1503'),
+        ('in_depth', '0037_auto_20240308_1840'),
     ]
 
     operations = [

diff --git a/.../0029_specify_heading_levels_in_labels.py → .../0030_specify_heading_levels_in_labels.py b/.../0029_specify_heading_levels_in_labels.py → .../0030_specify_heading_levels_in_labels.py
@@ -12,7 +12,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('report', '0028_optional_boxblock_title_field'),
+        ('report', '0029_alter_report_sections'),
     ]
 
     operations = [