diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-01 01:36:34 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-01 01:36:34 +0800 |
| commit | bfefb6e696bc7b31a9f541edb32afc2f986b9184 (patch) | |
| tree | 6f8fd39be758324288779dff44ab244976356fe6 | |
| parent | 95b7601e2bd3bef7ea7ca09230980982362f0e97 (diff) | |
| download | dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar.gz dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar.bz2 dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar.lz dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar.xz dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.tar.zst dexon-sol-tools-bfefb6e696bc7b31a9f541edb32afc2f986b9184.zip | |
Remove merge conflicts from yarn.lock
| -rw-r--r-- | yarn.lock | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -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" |