|
|
@@ -7189,27 +7189,9 @@ redis@^2.1.0:
|
|
|
redis-commands "^1.2.0"
|
|
|
redis-parser "^2.6.0"
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-reduce-component@1.0.1:
|
|
|
- version "1.0.1"
|
|
|
- resolved "https://registry.yarnpkg.com/reduce-component/-/reduce-component-1.0.1.tgz#e0c93542c574521bea13df0f9488ed82ab77c5da"
|
|
|
-
|
|
|
-reduce-css-calc@^1.2.6:
|
|
|
- version "1.3.0"
|
|
|
- resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
|
|
|
- dependencies:
|
|
|
- balanced-match "^0.4.2"
|
|
|
- math-expression-evaluator "^1.2.14"
|
|
|
- reduce-function-call "^1.0.1"
|
|
|
-
|
|
|
-reduce-function-call@^1.0.1:
|
|
|
- version "1.0.2"
|
|
|
- resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
|
|
|
-=======
|
|
|
reduce-css-calc@^2.0.0:
|
|
|
version "2.1.4"
|
|
|
resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.4.tgz#c20e9cda8445ad73d4ff4bea960c6f8353791708"
|
|
|
->>>>>>> master
|
|
|
dependencies:
|
|
|
css-unit-converter "^1.1.1"
|
|
|
postcss-value-parser "^3.3.0"
|
sou