use 2.x in doc.sh

kuzzleio · Aug 6, 2019 · ed23348 · ed23348
1 parent 79299bc
commit ed23348
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -18,4 +18,5 @@ internal/wrappers/kcore_wrap\.o
 *.so
 *.a
 
-.doc/framework
+.doc/framework
+node_modules/