Skip to content
Snippets Groups Projects
Commit f2fcb9dd authored by Piotr Gawron's avatar Piotr Gawron
Browse files

migration db conflict resolved

parent ce258019
No related branches found
No related tags found
1 merge request!153Resolve "name of the voucher partner shouldn't be split into first name/last name"
Pipeline #
Hide whitespace changes
Inline Side-by-side
smash/web/migrations/0117_voucher_activity_type.py → smash/web/migrations/0118_voucher_activity_type.py
+ 1
− 1
View file @ f2fcb9dd
......@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('web', '0116_auto_20180611_1346'),
('web', '0117_auto_20180717_1434'),
]
operations = [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment