diff options
| author |  Johannes Christ <[email protected]> | 2019-10-11 21:47:58 +0200 |
|---|---|---|
| committer | Johannes Christ <[email protected]> | 2019-10-11 21:47:58 +0200 |
| commit | 673cc3bd89056d288451085488ae6f1f67cc1e21 (patch) | |
| tree | 606cef27898941f4883b7e051ca2d2080f9be887 /pydis_site | |
| parent | Improve formatting for `has_delete_permission`, typespec. (diff) | |
Resolve migration merge conflicts.
Diffstat (limited to 'pydis_site')
| -rw-r--r-- | pydis_site/apps/api/migrations/0045_add_plural_name_for_log_entry.py (renamed from pydis_site/apps/api/migrations/0044_add_plural_name_for_log_entry.py) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pydis_site/apps/api/migrations/0044_add_plural_name_for_log_entry.py b/pydis_site/apps/api/migrations/0045_add_plural_name_for_log_entry.py index 6f388179..6b9933d8 100644 --- a/pydis_site/apps/api/migrations/0044_add_plural_name_for_log_entry.py +++ b/pydis_site/apps/api/migrations/0045_add_plural_name_for_log_entry.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('api', '0043_infraction_hidden_warnings_to_notes'), + ('api', '0044_migrate_nominations_from_infraction_to_nomination_model'), ] operations = [ |