diff options
| author |  RohanJnr <[email protected]> | 2021-11-05 10:49:30 +0530 |
|---|---|---|
| committer | RohanJnr <[email protected]> | 2021-11-05 10:49:30 +0530 |
| commit | 2b95db672e649d9fc1159b3e2211dcb72560d8f6 (patch) | |
| tree | 21bd659b40b79f94c22087b720c5d3a53f59ac41 /pydis_site/apps/api/migrations | |
| parent | Pull from upstream/main and resolve conflicts. (diff) | |
Fix: Conflicting migrations.
Diffstat (limited to 'pydis_site/apps/api/migrations')
| -rw-r--r-- | pydis_site/apps/api/migrations/0074_merge_20211105_0518.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py new file mode 100644 index 00000000..ebf5ae15 --- /dev/null +++ b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.14 on 2021-11-05 05:18 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0072_merge_20210724_1354'), + ('api', '0073_otn_allow_GT_and_LT'), + ] + + operations = [ + ] |