Resolve yarn.lock

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve yarn.lock
Signed-off-by: Rémy Coutable <remy@rymai.me>
82606e16 · Rémy Coutable · b2954efd · 82606e16
Commit 82606e16 authored Oct 04, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

yarn.lock yarn.lock +3 -8

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -641,7 +641,6 @@
    lodash "^4.17.10"
    to-fast-properties "^2.0.0"
-<<<<<<< HEAD
 "@babel/types@^7.1.2":
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0"
@@ -651,19 +650,15 @@
    lodash "^4.17.10"
    to-fast-properties "^2.0.0"
-"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.29.0":
+"@gitlab-org/gitlab-svgs@^1.23.0":
  version "1.29.0"
  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.29.0.tgz#03b65b513f9099bbda6ecf94d673a2952f8c6c70"
  integrity sha512-sCl6nP3ph36+8P3nrw9VanAR648rgOUEBlEoLPHkhKm79xB1dUkXGBtI0uaSJVgbJx40M1/Ts8HSdMv+PF3EIg==
-=======
 "@gitlab-org/gitlab-svgs@^1.29.0":
  version "1.30.0"
  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.30.0.tgz#72dca2fb67bafb3c975a322dc6406aaa29aed86c"
+  integrity sha512-Spx4GQg2TWB7VtaohgnGHmOPiF/eiXGg3n8NxpEqTR0k+dqlDs9BQHRI9H/koW9goVFrQfHEZpLz4sUkGCuAfQ==
-"@gitlab-org/gitlab-svgs@^1.30.0":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.31.0.tgz#495b074669f93af40e34f9978ce887773dea470a"
->>>>>>> origin/master
 "@gitlab-org/gitlab-ui@^1.8.0":
  version "1.8.0"