Merge pull request #1636 from laws-africa/migrations

fix clashing migrations
laws-africa · Dec 5, 2023 · 77b26ca · 77b26ca
2 parents 1acc1ad + 5d133f1
commit 77b26ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ons/0110_peachjamsettings_admin_emails.py → ...ons/0111_peachjamsettings_admin_emails.py b/...ons/0110_peachjamsettings_admin_emails.py → ...ons/0111_peachjamsettings_admin_emails.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("peachjam", "0109_add_overturned_and_upheld_predicates"),
+        ("peachjam", "0110_alter_peachjamsettings_options"),
     ]
 
     operations = [

diff --git a/..._peachjamsettings_pagerank_pivot_value.py → ..._peachjamsettings_pagerank_pivot_value.py b/..._peachjamsettings_pagerank_pivot_value.py → ..._peachjamsettings_pagerank_pivot_value.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("peachjam", "0110_alter_peachjamsettings_options"),
+        ("peachjam", "0111_peachjamsettings_admin_emails"),
     ]
 
     operations = [