mirror of
https://github.com/danog/code-server.git
synced 2024-12-14 18:28:13 +01:00
eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible. |
||
---|---|---|
.. | ||
resources/icons | ||
src | ||
.vscodeignore | ||
extension-browser.webpack.config.js | ||
extension.webpack.config.js | ||
package.json | ||
package.nls.json | ||
README.md | ||
tsconfig.json | ||
yarn.lock |
Merge Conflict
Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
Features
See Merge Conflicts in VS Code to learn about features of this extension.