mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-02 00:44:52 +01:00
Fix merge conflict
This commit is contained in:
parent
b57c8a79c0
commit
bb42369af2
1 changed files with 5 additions and 6 deletions
|
|
@ -12,8 +12,9 @@
|
|||
"checkbox_key": "enabled",
|
||||
"children": [
|
||||
{
|
||||
"type": "label",
|
||||
"label": "This plugin is not optional due to implicit creation through loading the \"rig\" family.\nThis family is also hidden from creation due to complexity in setup."
|
||||
"type": "boolean",
|
||||
"key": "enabled",
|
||||
"label": "Enabled"
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
|
|
@ -119,12 +120,10 @@
|
|||
"collapsible": true,
|
||||
"key": "CreateAnimation",
|
||||
"label": "Create Animation",
|
||||
"checkbox_key": "enabled",
|
||||
"children": [
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "enabled",
|
||||
"label": "Enabled"
|
||||
"type": "label",
|
||||
"label": "This plugin is not optional due to implicit creation through loading the \"rig\" family.\nThis family is also hidden from creation due to complexity in setup."
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue