From 16f00eb247968290581fb01e416c09c47b70e230 Mon Sep 17 00:00:00 2001
From: Dan Mindru <mindrudan@gmail.com>
Date: Tue, 7 Feb 2017 23:45:12 +0100
Subject: [PATCH] Upgrade node

---
 .nvmrc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index fc43d31..02a819f 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1,6 +1 @@
-<<<<<<< HEAD
-v5
-||||||| merged common ancestors
-=======
-v4
->>>>>>> master
+v7