Browse Source

fix/fixed merge conflict

pull/3035/head
Muhammed Mustafa 2 years ago
parent
commit
ccea47062a
  1. 2
      packages/nc-gui-v2/components/smartsheet/sidebar/menu/ApiSnippet.vue
  2. 2
      packages/nc-gui-v2/package-lock.json

2
packages/nc-gui-v2/components/smartsheet/sidebar/menu/ApiSnippet.vue

@ -142,6 +142,8 @@ const afterVisibleChange = (visible: boolean) => {
:model-value="code" :model-value="code"
:read-only="true" :read-only="true"
lang="typescript" lang="typescript"
:validate="false"
:disable-deep-compare="true"
/> />
<div class="flex flex-row w-full justify-end space-x-3 mt-4 uppercase"> <div class="flex flex-row w-full justify-end space-x-3 mt-4 uppercase">
<a-button <a-button

2
packages/nc-gui-v2/package-lock.json generated

@ -10568,7 +10568,6 @@
"version": "4.1.3", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz",
"integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==", "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==",
"dev": true,
"dependencies": { "dependencies": {
"call-bind": "^1.0.2", "call-bind": "^1.0.2",
"define-properties": "^1.1.4", "define-properties": "^1.1.4",
@ -23144,7 +23143,6 @@
"version": "4.1.3", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz",
"integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==", "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==",
"dev": true,
"requires": { "requires": {
"call-bind": "^1.0.2", "call-bind": "^1.0.2",
"define-properties": "^1.1.4", "define-properties": "^1.1.4",

Loading…
Cancel
Save