Merge branch 'master' into no-object-literal-type-assertion

microsoft · May 6, 2017 · b1c50d3 · b1c50d3
2 parents c2f68b9 + 214daae
commit b1c50d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -27,15 +27,15 @@
     "fs-promise": "^2.0.0",
     "parsimmon": "^1.2.0",
     "strip-json-comments": "^2.0.1",
+    "tslint": "^5.1.0",
     "tsutils": "^1.1.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^2.0.0",
     "@types/mz": "0.0.30",
     "@types/node": "^7.0.5",
     "@types/parsimmon": "^1.0.3",
-    "@types/strip-json-comments": "0.0.28",
-    "tslint": "^5.1.0",
+    "@types/strip-json-comments": "^0.0.28",
     "typescript": "^2.3.0"
   },
   "engines": {