chore(vscode): improve vscode ignore (#4402)

Author: benfdking

vscode/extension/.vscodeignore

@@ -12,8 +12,6 @@ vsc-extension-quickstart.md
 **/*.map
 **/*.ts
 **/.vscode-test.*
-<<<<<<< HEAD
 assets/logo.svg
 esbuild.js
-=======
->>>>>>> c5ee2535 (progress)
+openapi.json