diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:04:40 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:04:40 +0000 |
| commit | 16a935f28f5d9a69d0cd310d1ef035d82ee4b575 (patch) | |
| tree | c9db1bfa804dcabfe28dc6993bd57b92afa63b6e /yarn.lock | |
| parent | dfe2fabfe79d30c160b4374611c5bccb83f272fd (diff) | |
| parent | c14927dcd1568c33c3ae4cc846eff12fc4aa362a (diff) | |
| download | gitlab-ce-16a935f28f5d9a69d0cd310d1ef035d82ee4b575.tar.gz | |
Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'
Resolve CE/EE difference in FE dependency files
See merge request gitlab-org/gitlab-ce!26856
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yarn.lock b/yarn.lock index 581d5818ccc..15fa876300b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2804,7 +2804,7 @@ d3-dsv@1, d3-dsv@1.0.8: iconv-lite "0.4" rw "1" -d3-ease@1, d3-ease@1.0.3: +d3-ease@1, d3-ease@1.0.3, d3-ease@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e" integrity sha1-aL+8NJM4o4DETYrMT7wzBKotjA4= @@ -2920,7 +2920,7 @@ d3-timer@1, d3-timer@1.0.7: resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531" integrity sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA== -d3-transition@1, d3-transition@1.1.1: +d3-transition@1, d3-transition@1.1.1, d3-transition@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039" integrity sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ== |