synced/void
1
0
Fork 0
mirror of https://github.com/voideditor/void.git synced 2025-03-31 22:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
void/extensions/merge-conflict
History
Andrew Pareles 3b901ad60f init
2025-02-28 18:01:53 -08:00
..
media
init commit
2024-09-10 19:37:36 -07:00
src
init commit
2024-09-10 19:37:36 -07:00
.npmrc
init
2025-02-28 18:01:53 -08: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
init
2025-02-28 18:01:53 -08:00
package.json
init
2025-02-28 18:01:53 -08: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.