resolve merge conflicts

This commit is contained in:
Naegelin 2022-08-12 18:26:13 +02:00
commit 2b3a83b1c8
4 changed files with 29 additions and 4 deletions

View file

@ -13672,6 +13672,18 @@
"isRequired": false,
"constant": false,
"reactive": false
},
{
"name": "active",
"kind": "let",
"description": "Set to `true` to show the toolbar regardless of row selection",
"type": "boolean",
"value": "false",
"isFunction": false,
"isFunctionDeclaration": false,
"isRequired": false,
"constant": false,
"reactive": false
}
],
"moduleExports": [],