maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Christof Marti 264d0c2ec8 Name, description, icon for merge-conflict extension (#43978)
2018-02-26 09:48:34 +01:00
..
resources/icons Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
src Update extensions for TS 2.7 2018-02-08 14:28:55 -08:00
.vscodeignore
package.json Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
package.nls.json Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
README.md Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
tsconfig.json
yarn.lock Use latest version of telemetry module 2018-02-23 14:57:27 -08:00

README.md

Merge Conflict

Notice This is a an extension that is bundled with Visual Studio Code.