Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2018-02-12 22:04:59 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2018-02-13 00:59:32 +0300
commit954bfb5db557b7455e913e42be5b851d94d0a49d (patch)
tree2b267bf8fac2d6b747ae04fac5db3e835fde3fdc /yarn.lock
parentc833a09d9156e26851746250460ddd2f091e73cd (diff)
Addressed mr observations
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock14
1 files changed, 6 insertions, 8 deletions
diff --git a/yarn.lock b/yarn.lock
index fa8ed3f4298..3285fdae331 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4401,11 +4401,11 @@ karma@^2.0.0:
tmp "0.0.33"
useragent "^2.1.12"
-katex@^0.9.0-alpha2:
- version "0.9.0-alpha2"
- resolved "https://registry.yarnpkg.com/katex/-/katex-0.9.0-alpha2.tgz#f559e8bb32969082d735d949960b7df133fd5831"
+katex@^0.8.3:
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/katex/-/katex-0.8.3.tgz#909d99864baf964c3ccae39c4a99a8e0fb9a1bd0"
dependencies:
- match-at "^0.1.1"
+ match-at "^0.1.0"
kind-of@^3.0.2:
version "3.1.0"
@@ -4797,7 +4797,7 @@ marked@^0.3.12:
version "0.3.12"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
-match-at@^0.1.1:
+match-at@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/match-at/-/match-at-0.1.1.tgz#25d040d291777704d5e6556bbb79230ec2de0540"
@@ -7093,20 +7093,18 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-<<<<<<< HEAD
style-loader@^0.19.1:
version "0.19.1"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
dependencies:
loader-utils "^1.0.2"
schema-utils "^0.3.0"
-=======
+
subarg@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
dependencies:
minimist "^1.1.0"
->>>>>>> master
supports-color@^2.0.0:
version "2.0.0"