diff options
| author |  Johannes Christ <[email protected]> | 2018-09-01 17:54:38 +0200 |
|---|---|---|
| committer | Johannes Christ <[email protected]> | 2018-09-01 17:54:38 +0200 |
| commit | 717f3804d2998618b3c345bd9cbb4b42703858c9 (patch) | |
| tree | 12c2e30a29dd052d9ca5e5c1525157e4b905216f /api | |
| parent | Add the GET route. (diff) | |
Fix migration conflicts.
Diffstat (limited to 'api')
| -rw-r--r-- | api/migrations/0003_offtopicchannelname.py (renamed from api/migrations/0002_offtopicchannelname.py) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/migrations/0002_offtopicchannelname.py b/api/migrations/0003_offtopicchannelname.py index 890cd81f..2f19bfd8 100644 --- a/api/migrations/0002_offtopicchannelname.py +++ b/api/migrations/0003_offtopicchannelname.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('api', '0001_initial'), + ('api', '0002_documentationlink'), ] operations = [ |