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