resolve conflict of migration files

2020-03-10 17:45:36 +00:00 · 2020-03-10 17:45:36 +00:00 · 1c4cc0c3ed
parent af2cab8b03
commit 1c4cc0c3ed
1 changed files with 1 additions and 1 deletions
--- a/server/website/website/migrations/0011_knob_bound_fields.py
+++ b/server/website/website/migrations/0011_knob_bound_fields.py
@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('website', '0009_change_executiontime_function_field'),
+        ('website', '0010_add_pipeline_data_field'),
    ]

    operations = [