Solved merge conflict

takenet · May 22, 2018 · 0343497 · 0343497
2 parents 18f7840 + d223e38
commit 0343497
Show file tree

Hide file tree

Showing 16 changed files with 431 additions and 780 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,7 +65,6 @@ typings/
 
 ### VisualStudioCode ###
 .vscode/*
-!.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/docs/index.html b/docs/index.html