Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #5617 from brave/fix/package-json-node
Browse files Browse the repository at this point in the history
Resolve package.json engine.node version conflicts
  • Loading branch information
ayumi authored Nov 15, 2016
2 parents d1ad224 + 48d0af1 commit 0d11443
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ After installing the prerequisites:

If this fails on Linux with an error related to `abp-filter-parser-cpp`, try updating to Node 6.1 and `node-gyp` 3.3.1 (see discussion at https://github.com/brave/browser-laptop/issues/214)

Instead of `npm install` you may also install with [yarn](https://github.com/yarnpkg/yarn). This works with yarn 0.16.1 (`npm install -g yarn@0.16.1` then `yarn install`).

### Troubleshooting

Additional notes on troubleshooting installation issues are in the [Troubleshooting](https://github.com/brave/browser-laptop/wiki/Troubleshooting) page in the Wiki.
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
"immutablepatch": "brave/immutable-js-patch",
"keytar": "^3.0.0",
"l20n": "^3.5.1",
"ledger-balance": "^0.8.61",
"ledger-client": "^0.8.93",
"ledger-geoip": "^0.8.72",
"ledger-publisher": "^0.8.90",
"ledger-balance": "^0.8.62",
"ledger-client": "^0.8.94",
"ledger-geoip": "^0.8.73",
"ledger-publisher": "^0.8.91",
"lru_cache": "^1.0.0",
"moment": "^2.15.1",
"normalize-url": "^1.7.0",
Expand Down

0 comments on commit 0d11443

Please sign in to comment.