From 08f446ddf7e7514cda3a2aa4133e55e73b4473a7 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 16 Sep 2014 11:27:58 -0700
Subject: [PATCH] resolve merge conflicts

---
 src/compiler/parser.ts                   | 2 +-
 src/services/formatting/smartIndenter.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 5aa333f4c84..40d9722af00 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -498,7 +498,7 @@ module ts {
             case SyntaxKind.ForInStatement:
             case SyntaxKind.ForStatement:
             case SyntaxKind.IfStatement:
-            case SyntaxKind.LabelledStatement:
+            case SyntaxKind.LabeledStatement:
             case SyntaxKind.ReturnStatement:
             case SyntaxKind.SwitchStatement:
             case SyntaxKind.ThrowKeyword:
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index adbc3d2a0cc..ad07f884cc5 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -209,6 +209,7 @@ module ts.formatting {
                         if ((<TypeReferenceNode>node.parent).typeArguments) {
                             return getActualIndentationFromList((<TypeReferenceNode>node.parent).typeArguments);
                         }
+                        break;
                     case SyntaxKind.ObjectLiteral:
                         return getActualIndentationFromList((<ObjectLiteral>node.parent).properties);
                     case SyntaxKind.TypeLiteral: