diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
| commit | 2e0916d8ff17c89147005d22e8c100113aaf3360 (patch) | |
| tree | c65e20274296658c753e40619eb5cfe0062dc12d /package.json | |
| parent | ef9435e3d0036af1358bb2a5faec5ce69ef159e7 (diff) | |
| parent | aab6e366c5162a85ae7853f5da29321f3d767cf4 (diff) | |
| download | tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.gz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.bz2 tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.lz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.xz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.zst tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index a39534983..ad77174f7 100644 --- a/package.json +++ b/package.json @@ -200,7 +200,6 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", - "superstatic": "^5.0.2", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", @@ -231,7 +230,7 @@ "brfs": "^1.6.1", "browserify": "^16.1.1", "chai": "^4.1.0", - "chromedriver": "2.36.0", + "chromedriver": "^2.41.0", "clipboardy": "^1.2.3", "compression": "^1.7.1", "coveralls": "^3.0.0", @@ -311,6 +310,7 @@ "shell-parallel": "^1.0.3", "sinon": "^5.0.0", "source-map": "^0.7.2", + "static-server": "^2.2.1", "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", |