From e66c824f31e01340af34e47417a224f8b9b721dd Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 16 Feb 2017 14:07:27 -0800
Subject: [PATCH] Remove unnecessary else clause

---
 src/compiler/scanner.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 54cd191b43d..82d75d2fa7c 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1724,9 +1724,7 @@ namespace ts {
                         pos = scanConflictMarkerTrivia(text, pos, error);
                         return token = SyntaxKind.ConflictMarkerTrivia;
                     }
-                    else {
-                        break;
-                    }
+                    break;
                 }
             }
             return token = SyntaxKind.JsxText;