From ed23348f7aad853dd239ab0fc7d03fbc6c671a48 Mon Sep 17 00:00:00 2001
From: Aschen <amaret93@gmail.com>
Date: Tue, 6 Aug 2019 17:51:04 +0200
Subject: [PATCH] use 2.x in doc.sh

---
 .doc/doc.sh | 5 -----
 .gitignore  | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.doc/doc.sh b/.doc/doc.sh
index b29625ea..f751f2aa 100644
--- a/.doc/doc.sh
+++ b/.doc/doc.sh
@@ -2,13 +2,8 @@
 
 set -eu
 
-<<<<<<< HEAD
 DOC_VERSION=2
 DOC_PATH=/sdk/go/2
-=======
-DOC_VERSION=1
-DOC_PATH=/sdk/go/1
->>>>>>> 1-dev
 
 # Used by vuepress
 export DOC_DIR=$DOC_VERSION
diff --git a/.gitignore b/.gitignore
index 8a01365c..16c2beda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ internal/wrappers/kcore_wrap\.o
 *.so
 *.a
 
-.doc/framework
\ No newline at end of file
+.doc/framework
+node_modules/
\ No newline at end of file