Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

migrations: Fix conflict.

This commit is contained in:
derAnfaenger 2017-11-17 09:38:13 +01:00 committed by showell
parent 395f1e9270
commit 6049cd27b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/migrations/0118_botuserconfigdata.py → zerver/migrations/0120_botuserconfigdata.py
View File

@ -10,7 +10,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('zerver', '0117_add_desc_to_user_group'), ('zerver', '0119_userprofile_night_mode'),
] ]
operations = [ operations = [