resolve conflict

This commit is contained in:
Kayla Man 2023-06-30 21:09:41 +08:00
commit 0afd9aa97e
60 changed files with 1656 additions and 331 deletions

View file

@ -32,10 +32,18 @@
"skip_timelines_check": [
".*"
]
},
"ValidateContainers": {
"enabled": true,
"optional": true,
"active": true
}
},
"workfile_builder": {
"create_first_version": false,
"custom_templates": []
},
"templated_workfile_build": {
"profiles": []
}
}