Skip to content

Commit

Permalink
fix: conflict merge npm
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreBulete committed Nov 9, 2024
2 parents 7db8d1f + 1ba277c commit fbf269c
Show file tree
Hide file tree
Showing 11 changed files with 520 additions and 157,930 deletions.
6 changes: 5 additions & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
<tab>opengento</tab>
<resource>Opengento_BetterBo::system_config</resource>
<group id="general" translate="label" sortOrder="0" type="text" showInDefault="1">
<label>General</label>
<label>General</label>
<field id="attributes_fields_type" sortOrder="10" type="multiselect" showInDefault="1">
<label>Attributes fields type</label>
<source_model>Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype</source_model>
</field>
<field id="tinymce_api_key" translate="label" type="text" sortOrder="20" showInDefault="1">
<label>TinyMCE API Key</label>
<comment>Enter your TinyMCE API key here</comment>
</field>
</group>
</section>
</system>
Expand Down
293 changes: 293 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"vue-loader": "^16.8.3"
},
"dependencies": {
"@tinymce/tinymce-vue": "^6.1.0",
"@vueup/vue-quill": "^1.2.0",
"@vueuse/core": "^10.3.0",
"axios": "^1.3.4",
"axios-cache-interceptor": "^1.0.1",
Expand Down
35 changes: 1 addition & 34 deletions view/adminhtml/web/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fbf269c

Please sign in to comment.