From 2f7e7383764ab1b87e071807627817558fe4a56a Mon Sep 17 00:00:00 2001
From: Vladimir Matsveyeu <vladima@microsoft.com>
Date: Thu, 28 Jul 2016 13:14:01 -0700
Subject: [PATCH] resolve merge issues

---
 src/server/scriptInfo.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
index 901e247df6c..9ad3b6ca111 100644
--- a/src/server/scriptInfo.ts
+++ b/src/server/scriptInfo.ts
@@ -23,7 +23,7 @@ namespace ts.server {
             this.path = toPath(fileName, host.getCurrentDirectory(), createGetCanonicalFileName(host.useCaseSensitiveFileNames));
             this.svc = ScriptVersionCache.fromString(host, content);
             this.formatCodeSettings = getDefaultFormatCodeSettings(this.host);
-            this.scriptKind = scriptKind && scriptKind !== ScriptKind.Unknown
+            this.scriptKind = scriptKind
                 ? scriptKind
                 : getScriptKindFromFileName(fileName);
         }