added fixes and node10 support

danibram · May 8, 2018 · 4444f2b · 4444f2b
2 parents 41441f2 + fb205b8
commit 4444f2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ node_js:
   - 8
   - 6
   - 4
+  - 10
 env:
   - CXX=g++-4.8
 addons:

diff --git a/package.json b/package.json
@@ -101,8 +101,13 @@
         "prettier": "^1.12.1",
         "standard-version": "^4.3.0",
         "trash-cli": "^1.4.0",
+<<<<<<< HEAD
         "ts-node": "^6.0.3",
         "tslint": "^5.10.0",
+=======
+        "ts-node": "^6.0.0",
+        "tslint": "^5.9.1",
+>>>>>>> greenkeeper/update-to-node-10
         "tslint-config-standard": "^7.0.0",
         "typedoc": "^0.11.1",
         "typescript": "^2.8.3"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ node_js: @@
       - 8
       - 6
       - 4
+      - 10
     env:
       - CXX=g++-4.8
     addons:
@@ Expand Down @@