diff options
| author |  RohanJnr <[email protected]> | 2021-07-24 19:26:36 +0530 |
|---|---|---|
| committer | RohanJnr <[email protected]> | 2021-07-24 19:26:36 +0530 |
| commit | d52f21c1fefbb396762dd74609b9957ae029dfc3 (patch) | |
| tree | 17d83aff248db2137f999319ae8e14569160594b | |
| parent | Merge branch 'main' into otn_softdel (diff) | |
fix CommandError: Conflicting migrations detected.
| -rw-r--r-- | pydis_site/apps/api/migrations/0072_merge_20210724_1354.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py new file mode 100644 index 00000000..f12efab5 --- /dev/null +++ b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.14 on 2021-07-24 13:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0071_increase_message_content_4000'), + ('api', '0070_auto_20210519_0545'), + ] + + operations = [ + ] |