From e415428386caae19aa0398aea66ee5053569abcf Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com>
Date: Fri, 18 Oct 2019 12:52:11 +0200
Subject: Solve migration conflict by renaming migrations

The migration files were generated and named before the migrations
added by other pull requests. This caused the migration path to
diverge. Since the migrations did not touch the same models, the
solution was to rename the migration files to place them at the end
of the migration history.
---
 .../apps/api/tests/migrations/test_active_infraction_migration.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pydis_site/apps/api/tests')

diff --git a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py
index cfae4219..61574b7e 100644
--- a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py
+++ b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py
@@ -81,8 +81,8 @@ class InfractionFactoryTests(MigrationsTestCase):
     """Tests for the InfractionFactory."""
 
     app = "api"
-    migration_prior = "0043_infraction_hidden_warnings_to_notes"
-    migration_target = "0043_infraction_hidden_warnings_to_notes"
+    migration_prior = "0045_add_plural_name_for_log_entry"
+    migration_target = "0045_add_plural_name_for_log_entry"
 
     @classmethod
     def setUpPostMigrationData(cls, apps):
@@ -183,8 +183,8 @@ class ActiveInfractionMigrationTests(MigrationsTestCase):
     """
 
     app = "api"
-    migration_prior = "0043_infraction_hidden_warnings_to_notes"
-    migration_target = "0044_active_infractions_migration"
+    migration_prior = "0045_add_plural_name_for_log_entry"
+    migration_target = "0046_active_infractions_migration"
 
     @classmethod
     def setUpMigrationData(cls, apps):
-- 
cgit v1.2.3