From ad1c9b91e5d26a06c7bf4c0624a2c8709343388a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 6 Sep 2016 18:26:09 -0700
Subject: [PATCH] Fix merge issue

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 50ce298d2d7..a7daeed2459 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3094,7 +3094,7 @@ namespace ts {
             // Use the type of the initializer expression if one is present
             if (declaration.initializer) {
                 const exprType = checkExpressionCached(declaration.initializer);
-                const type = getCombinedNodeFlags(declaration) & (NodeFlags.Const | NodeFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);
+                const type = getCombinedModifierFlags(declaration) & (ModifierFlags.Const | ModifierFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);
                 return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
             }