yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-24 13:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts with yarn lock

Browse Source
This commit is contained in:
bulby97 2021-08-20 09:14:47 +02:00
parent 92b7665067
commit e5c06b848f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yarn.lock
View File

@ -4079,6 +4079,7 @@
tslib "^2.0.0"
upath "2.0.1"
<<<<<<< HEAD
"@storybook/addon-actions@6.3.7", "@storybook/addon-actions@^6.3.7":
version "6.3.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.3.7.tgz#b25434972bef351aceb3f7ec6fd66e210f256aac"
@ -4915,6 +4916,8 @@
resolve-from "^5.0.0"
store2 "^2.12.0"
=======
>>>>>>> ade0a8767 (Fix conflicts with yarn lock)
"@strapi/icons@0.0.1-alpha.15":
version "0.0.1-alpha.15"
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.15.tgz#32fc824b732b4a21d5282f84696d6207ac5cbea1"