resolve conflict of migration files
This commit is contained in:
parent
af2cab8b03
commit
1c4cc0c3ed
|
@ -8,7 +8,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('website', '0009_change_executiontime_function_field'),
|
('website', '0010_add_pipeline_data_field'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
Loading…
Reference in New Issue