Fix migration conflict

This commit is contained in:
Aurélien Delobelle 2017-10-24 16:51:54 +02:00
parent 8b1f174b13
commit 8673da1874

View file

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