Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-24 09:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
void/extensions/merge-conflict
History
Andrew 8ca1354580 rebase from vscode f35c3823
2024-09-24 04:46:08 +00:00
..
media init commit 2024-09-10 19:37:36 -07:00
src init commit 2024-09-10 19:37:36 -07:00
.vscodeignore rebase from vscode f35c3823 2024-09-24 04:46:08 +00:00
extension-browser.webpack.config.js init commit 2024-09-10 19:37:36 -07:00
extension.webpack.config.js init commit 2024-09-10 19:37:36 -07:00
package-lock.json feat: swtich to npm as default package manager 2024-09-19 02:22:27 +02:00
package.json init commit 2024-09-10 19:37:36 -07:00
package.nls.json init commit 2024-09-10 19:37:36 -07:00
README.md init commit 2024-09-10 19:37:36 -07:00
tsconfig.json init commit 2024-09-10 19:37:36 -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.