From 1c4cc0c3ede4f05934213e06868685853c718202 Mon Sep 17 00:00:00 2001 From: yangdsh Date: Tue, 10 Mar 2020 17:45:36 +0000 Subject: [PATCH] resolve conflict of migration files --- server/website/website/migrations/0011_knob_bound_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/website/website/migrations/0011_knob_bound_fields.py b/server/website/website/migrations/0011_knob_bound_fields.py index be910aa..904ef6b 100644 --- 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 = [