From 56883ef6b881d7ba8fc0da379e60574d29224fe7 Mon Sep 17 00:00:00 2001 From: Adan Ulloa Date: Tue, 21 Jan 2020 15:27:36 -0600 Subject: [PATCH] chore(components): add untracked files --- yarn.lock | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index f6c409b5..c61b729c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4173,15 +4173,9 @@ carbon-components@10.9.0: lodash.debounce "^4.0.8" warning "^3.0.0" -<<<<<<< HEAD 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" -======= -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" ->>>>>>> starting side nav integrity sha512-5kPCxcED9OXV96NRFKqWbUGRfBf4qX0XcvYqV4c5IL8yGaJGWu1qows7ldENqhwVGXrfsBNQ7tDoR0fIC3CSsw== carbon-icons@^7.0.7: @@ -11130,17 +11124,10 @@ rollup-pluginutils@^2.3.3, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -<<<<<<< HEAD -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== -======= rollup@^1.29.0: version "1.29.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.29.0.tgz#6a1a79eea43ca9d3d79a90c15a1ceecedc72097b" integrity sha512-V63Iz0dSdI5qPPN5HmCN6OBRzBFhMqNWcvwgq863JtSCTU6Vdvqq6S2fYle/dSCyoPrBkIP3EIr1RVs3HTRqqg== ->>>>>>> starting side nav dependencies: "@types/estree" "*" "@types/node" "*" @@ -11995,11 +11982,7 @@ svelte-loader@^2.13.6: loader-utils "^1.1.0" svelte-dev-helper "^1.1.9" -<<<<<<< HEAD -svelte@^3.16.4: -======= svelte@^3.16.7: ->>>>>>> starting side nav version "3.16.7" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.16.7.tgz#9ade80a4bbbac95595c676dd817222f632fa2c07" integrity sha512-egrva1UklB1n7KAv179IhDpQzMGAvubJUlOQ9PitmmZmAfrCUEgrQnx2vPxn2s+mGV3aYegXvJ/yQ35N2SfnYQ==