From 59fbe319a154298c3938eb40ef89fe4ee9b49124 Mon Sep 17 00:00:00 2001
From: Phil Price <philip_price@live.com>
Date: Mon, 22 May 2017 17:06:30 -0700
Subject: [PATCH] Formatting change

---
 extensions/merge-conflict/src/documentTracker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/merge-conflict/src/documentTracker.ts b/extensions/merge-conflict/src/documentTracker.ts
index 06082b0fa6f..06c526d5c01 100644
--- a/extensions/merge-conflict/src/documentTracker.ts
+++ b/extensions/merge-conflict/src/documentTracker.ts
@@ -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 [];
 		}