Merge pull request #476 from resin-io/fix-peer-dep-error

Move to a consistent resin-token by upgrading to new v6 SDK and resin-cli-auth

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### Fixed
+
+- Fixed warning on NPM install due to dependency conflicts
+
 ## [5.7.1] - 2017-04-03
 
 ### Fixed

package.json

@@ -55,7 +55,7 @@
     "prettyjson": "^1.1.3",
     "reconfix": "^0.0.3",
     "raven": "^1.2.0",
-    "resin-cli-auth": "^1.0.0",
+    "resin-cli-auth": "^1.1.3",
     "resin-cli-errors": "^1.2.0",
     "resin-cli-form": "^1.4.1",
     "resin-cli-visuals": "^1.3.0",
@@ -64,7 +64,7 @@
     "resin-device-init": "^2.2.0",
     "resin-image-fs": "^2.1.2",
     "resin-image-manager": "^4.1.1",
-    "resin-sdk-preconfigured": "^0.1.2",
+    "resin-sdk-preconfigured": "^6.0.0",
     "resin-settings-client": "^3.5.0",
     "resin-sync": "^7.0.0",
     "rimraf": "^2.4.3",