mcp/carbon-components-svelte
1
0
Fork 0
mirror of https://github.com/carbon-design-system/carbon-components-svelte.git synced 2025-09-15 02:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Adan Ulloa 2020-01-20 12:40:42 -06:00
commit 397c53b48e
25 changed files with 16 additions and 1330 deletions
Download patch file Download diff file Expand all files Collapse all files

15
yarn.lock
View file

@ -2210,6 +2210,7 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
<<<<<<< HEAD
<<<<<<< HEAD
"@types/node@*":
version "13.1.6"
@ -2221,6 +2222,8 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f"
integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug==
=======
=======
>>>>>>> upstream/master
"@types/node@*", "@types/node@^12.0.2":
version "12.12.17"
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz#191b71e7f4c325ee0fb23bc4a996477d92b8c39b"
@ -3769,11 +3772,17 @@ carbon-components@10.9.0:
lodash.debounce "^4.0.8"
warning "^3.0.0"
<<<<<<< HEAD
<<<<<<< HEAD
carbon-icons-svelte@^10.8.1:
version "10.8.2"
resolved "https://registry.yarnpkg.com/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b"
=======
carbon-icons-svelte@^10.8.2:
version "10.8.2"
resolved "https://registry.npmjs.org/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b"
>>>>>>> upstream/master
=======
carbon-icons-svelte@^10.8.2:
version "10.8.2"
resolved "https://registry.npmjs.org/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b"
@ -10767,6 +10776,9 @@ rollup@^1.27.13:
version "1.27.14"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.14.tgz#940718d5eec1a6887e399aa0089944bae5c4f377"
integrity sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ==
<<<<<<< HEAD
>>>>>>> upstream/master
=======
>>>>>>> upstream/master
dependencies:
"@types/estree" "*"
@ -11628,6 +11640,9 @@ svelte-loader@^2.13.6:
svelte@^3.16.7:
=======
svelte@^3.16.4:
<<<<<<< HEAD
>>>>>>> upstream/master
=======
>>>>>>> upstream/master
version "3.16.7"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.16.7.tgz#9ade80a4bbbac95595c676dd817222f632fa2c07"