fix merge conflict
This commit is contained in:
parent
e928cef22a
commit
6f7ebb5891
1 changed files with 1 additions and 0 deletions
|
@ -22,6 +22,7 @@
|
||||||
"@fortawesome/free-regular-svg-icons": "5.15.1",
|
"@fortawesome/free-regular-svg-icons": "5.15.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "5.15.1",
|
"@fortawesome/free-solid-svg-icons": "5.15.1",
|
||||||
"@fortawesome/vue-fontawesome": "2.0.0",
|
"@fortawesome/vue-fontawesome": "2.0.0",
|
||||||
|
"@kazvmoe-infra/pinch-zoom-element": "^1.2.0",
|
||||||
"body-scroll-lock": "2.6.4",
|
"body-scroll-lock": "2.6.4",
|
||||||
"chromatism": "3.0.0",
|
"chromatism": "3.0.0",
|
||||||
"cropperjs": "1.4.3",
|
"cropperjs": "1.4.3",
|
||||||
|
|
Loading…
Add table
Reference in a new issue