vscode/extensions/merge-conflict
Matt Bierner 308c1887df Update extensions for TS 2.7
Update src to build with TS 2.7

Explicitly assign this.message in the else body
2018-02-08 14:28:55 -08:00
..
src Update extensions for TS 2.7 2018-02-08 14:28:55 -08:00
.vscodeignore use vsce to determine what to package when bundling extensions 2017-06-21 16:17:21 +02:00
package.json Upgrade to latest language pack format 2018-01-30 00:11:57 +01:00
package.nls.json Adds "Accept All Current" to command palette 2017-11-27 15:48:02 -08:00
tsconfig.json Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
yarn.lock Upgrade to latest language pack format 2018-01-30 00:11:57 +01:00