Fix merge conflict

This commit is contained in:
Fabià Serra Arrizabalaga 2023-08-07 19:34:51 +02:00
parent b57c8a79c0
commit bb42369af2

View file

@ -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",