Upgrade node

2017-02-07 23:45:12 +01:00 · 2017-02-07 23:45:12 +01:00 · 16f00eb247
parent 090b3f03ed
commit 16f00eb247
1 changed files with 1 additions and 6 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -1,6 +1 @@
-<<<<<<< HEAD
-v5
-||||||| merged common ancestors
-=======
-v4
->>>>>>> master
+v7