[ci skip] Resolve yarn.lock

f8272be9 · Luke Bennett · 3aed71eb · f8272be9
Commit f8272be9 authored Dec 13, 2017 by Luke Bennett
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

yarn.lock yarn.lock +0 -6

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -54,15 +54,9 @@
    lodash "^4.2.0"
    to-fast-properties "^2.0.0"

-<<<<<<< HEAD
-"@gitlab-org/gitlab-svgs@^1.1.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.1.3.tgz#2beead1bcdd83e7400de29b01014bf17bf76318e"
-=======
 "@gitlab-org/gitlab-svgs@^1.2.0":
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.2.0.tgz#0b1181b5d2dd56a959528529750417c5f49159ca"
->>>>>>> 2f1fd0d9bbedfec1d84550fd7fe14aebe91713aa

 "@types/jquery@^2.0.40":
  version "2.0.48"