diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
| commit | afbc4c832ba86fcb94b612c93796a5ffa422b457 (patch) | |
| tree | dbdaa16920fd175171603b182d332dbf87655bd4 /package.json | |
| parent | ad3fa24a28c0ec45dca43a257005626a4027487a (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.gz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.bz2 tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.lz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.xz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.zst tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.zip | |
Git merge resolution.
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 53de07e4f..e29ef5185 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "scripts": { "start": "gulp dev", "lint": "gulp lint", - "dev": "gulp dev --debug", - "dist": "gulp dist", "buildCiUnits": "node test/integration/index.js", + "dev": "gulp dev --debug", + "dist": "gulp dist --disableLiveReload", "test": "npm run fastTest && npm run ci && npm run lint", "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", |