development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting change

Browse source
This commit is contained in:
Phil Price 2017-05-22 17:06:30 -07:00
parent f4c0e976e2
commit 59fbe319a1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/merge-conflict/src/documentTracker.ts
View file

@ -59,7 +59,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
console.info('%s -> Check document execution time: %dms', document.uri.toString(), stepEnd[1] / 1000000);
if(!containsConflict) {
if (!containsConflict) {
return [];
}