mirror of
https://github.com/coder/code-server.git
synced 2025-07-29 21:12:58 +08:00

These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
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.