diff options
| author |  ks129 <[email protected]> | 2020-08-30 08:27:07 +0300 |
|---|---|---|
| committer | ks129 <[email protected]> | 2020-08-30 08:27:07 +0300 |
| commit | ab634c6ef1d4b7cec3b8471262eec3ec727478d8 (patch) | |
| tree | 8bc83f4264b945f60682dc47a0c757318a2ae20a /pydis_site | |
| parent | Revert "Fix mess with migrations" (diff) | |
Create merge migration to fix conflicts
Diffstat (limited to 'pydis_site')
| -rw-r--r-- | pydis_site/apps/api/migrations/0061_merge_20200830_0526.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py b/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py new file mode 100644 index 00000000..f0668696 --- /dev/null +++ b/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.8 on 2020-08-30 05:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0060_populate_filterlists_fix'), + ('api', '0052_offtopicchannelname_used'), + ] + + operations = [ + ] |