diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2019-04-02 12:51:30 +0200 |
|---|---|---|
| committer | Lukas Eipert <leipert@gitlab.com> | 2019-04-02 12:51:30 +0200 |
| commit | c14927dcd1568c33c3ae4cc846eff12fc4aa362a (patch) | |
| tree | db5e66de3776f5dee69c329a1f49929e1e93a017 | |
| parent | d4a4f68db5a2c680f6aa174e6abba35ed83a2d89 (diff) | |
| download | gitlab-ce-leipert-resolve-fe-dependency-conflict-ce.tar.gz | |
Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ce
This resolved the one conflict we have in CE/EE.
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json index a2d96cc551a..d672370e9a3 100644 --- a/package.json +++ b/package.json @@ -56,11 +56,13 @@ "d3-array": "^1.2.1", "d3-axis": "^1.0.8", "d3-brush": "^1.0.4", + "d3-ease": "^1.0.3", "d3-scale": "^1.0.7", "d3-selection": "^1.2.0", "d3-shape": "^1.2.0", "d3-time": "^1.0.8", "d3-time-format": "^2.1.1", + "d3-transition": "^1.1.1", "dateformat": "^3.0.3", "deckar01-task_list": "^2.2.0", "diff": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 5d40bec659d..61f2736cab8 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== |