Logo
Explore Help
Sign In
cubetiq/code-server
1
0
Fork 0
You've already forked code-server
Code Issues Pull Requests Projects Releases Wiki Activity
Files
d1ad3fad5eed50e23d4371cb4491d115ecf7847e
code-server/lib/vscode/extensions/merge-conflict
History
Joe Previte 0cd3e39492 chore(vscode): update to 1.54.2
2021-03-11 10:27:10 -07:00
..
resources/icons
Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'
2020-12-15 15:52:33 -07:00
src
chore(vscode): update to 1.54.2
2021-03-11 10:27:10 -07:00
.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.54.2
2021-03-11 10:27:10 -07:00
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
Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'
2020-12-15 15:52:33 -07:00
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.

Reference in New Issue View Git Blame Copy Permalink
Powered by Gitea Version: 1.25.2 Page: 254ms Template: 6ms
English
English
Licenses API