From 5747c34eb570c260264179f85801a01155a0ae40 Mon Sep 17 00:00:00 2001 From: meriadec Date: Mon, 30 Apr 2018 23:55:10 +0200 Subject: [PATCH] Remove lint-staged which is highly annoying --- yarn.lock | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/yarn.lock b/yarn.lock index 579b1741..f697efc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1905,9 +1905,15 @@ app-builder-bin@1.8.6: version "1.8.6" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.6.tgz#85604ece9c1b63ed0437abe92ddaf41c88c3f2e4" optionalDependencies: +<<<<<<< HEAD app-builder-bin-linux "1.8.6" app-builder-bin-mac "1.8.6" app-builder-bin-win "1.8.6" +======= + app-builder-bin-linux "1.8.5" + app-builder-bin-mac "1.8.5" + app-builder-bin-win "1.8.5" +>>>>>>> Remove lint-staged which is highly annoying append-transform@^0.4.0: version "0.4.0" @@ -4085,9 +4091,19 @@ combined-stream@1.0.6, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" +<<<<<<< HEAD commander@2, commander@2.15.x, commander@^2.11.0, commander@^2.13.0, commander@^2.15.0, commander@^2.9.0, commander@~2.15.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" +======= +commander@2, commander@^2.13.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322" + +commander@2.14.x, commander@^2.11.0, commander@^2.9.0, commander@~2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" +>>>>>>> Remove lint-staged which is highly annoying commander@2.6.0: version "2.6.0" @@ -9126,6 +9142,7 @@ normalize-url@^1.4.0, normalize-url@^1.9.1: query-string "^4.1.0" sort-keys "^1.0.0" +<<<<<<< HEAD npm-bundled@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" @@ -9137,6 +9154,8 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" +======= +>>>>>>> Remove lint-staged which is highly annoying npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -11780,6 +11799,7 @@ string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" +<<<<<<< HEAD string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" @@ -11787,6 +11807,9 @@ string_decoder@~1.0.3: safe-buffer "~5.1.0" stringstream@~0.0.5: +======= +stringstream@~0.0.4, stringstream@~0.0.5: +>>>>>>> Remove lint-staged which is highly annoying version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"