From bfefb6e696bc7b31a9f541edb32afc2f986b9184 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 31 May 2018 10:36:34 -0700 Subject: Remove merge conflicts from yarn.lock --- yarn.lock | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'yarn.lock') diff --git a/yarn.lock b/yarn.lock index 51cd8cc0e..8da671ecc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5242,23 +5242,10 @@ growl@1.9.2: version "1.9.2" resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" -<<<<<<< HEAD gud@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" -gulp-sourcemaps@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c" - dependencies: - convert-source-map "^1.1.1" - graceful-fs "^4.1.2" - strip-bom "^2.0.0" - through2 "^2.0.0" - vinyl "^1.0.0" - -======= ->>>>>>> Use a newer version of node/yarn to speed-up deps instaation gulp-util@^3.0.0: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" -- cgit v1.2.3