DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

Fix migration conflict

Browse source
This commit is contained in:
Martin Pépin 2017-10-10 21:21:28 +02:00
parent 116b4da1a5
commit e0ab7f5f94
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kfet/migrations/0057_merge.py
View file

@ -1,12 +1,13 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('kfet', '0057_add_perms_config'),
('kfet', '0056_change_account_meta'), ('kfet', '0056_change_account_meta'),
('kfet', '0054_update_promos'), ('kfet', '0054_update_promos'),
] ]

2
kfet/migrations/0058_amend_supplier.py
View file

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('kfet', '0057_add_perms_config'), ('kfet', '0057_merge'),
] ]
operations = [ operations = [