vscode/extensions/merge-conflict
2018-03-01 16:43:06 -08:00
..
resources/icons
src
.vscodeignore
package.json Bump version (#43978) 2018-02-27 15:56:35 +01:00
package.nls.json Edit pass on built-in extension descriptions (#44875) 2018-03-01 16:43:06 -08:00
README.md
tsconfig.json
yarn.lock

Merge Conflict

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