summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock19
1 files changed, 19 insertions, 0 deletions
diff --git a/yarn.lock b/yarn.lock
index e6d5f239d83..9f691fdc941 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4397,6 +4397,12 @@ 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"
+ dependencies:
+ match-at "^0.1.1"
+
kind-of@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
@@ -4787,6 +4793,10 @@ 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:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/match-at/-/match-at-0.1.1.tgz#25d040d291777704d5e6556bbb79230ec2de0540"
+
math-expression-evaluator@^1.2.14:
version "1.2.16"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
@@ -7079,11 +7089,20 @@ 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"