coder/code-server
1
1
Fork 0
mirror of https://github.com/coder/code-server.git synced 2024-12-18 15:11:35 +03:00
Code Issues Packages Projects Releases Wiki Activity
aaf044728f
code-server/lib/vscode/extensions/merge-conflict
History
Akash Satheesan ec8894d6c4 chore(vscode): update to 1.56.0
2021-04-30 20:25:17 +05:30
..
media chore(vscode): update to 1.56.0 2021-04-30 20:25:17 +05:30
src chore(vscode): update to 1.56.0 2021-04-30 20:25:17 +05:30
.vscodeignore Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
extension-browser.webpack.config.js Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
extension.webpack.config.js Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
package.json chore(vscode): update to 1.56.0 2021-04-30 20:25:17 +05:30
package.nls.json Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
README.md Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
tsconfig.json chore(vscode): update to 1.56.0 2021-04-30 20:25:17 +05:30
yarn.lock chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00

README.md

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.