Fixed migration conflict.

This commit is contained in:
Antoine Nguyen
2020-01-22 09:48:06 +01:00
parent fac80445e4
commit f8d5f072f8
@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0017_auto_20190705_1045'),
('core', '0018_auto_20200104_1714'),
]
operations = [