Microsoft/vscode

mirror of https://github.com/microsoft/vscode.git synced 2026-02-25 20:24:04 +00:00

Files

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

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

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

Add additional no unused checks for merge-conflict extension

2017-11-07 11:22:08 -08:00

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.