resolve merge conflicts

vladima · vladima · commit 08f446ddf7e7 · 2014-09-16T11:27:58.000-07:00
diff --git 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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ module ts.formatting {`
`209`	`209`	`if ((<TypeReferenceNode>node.parent).typeArguments) {`
`210`	`210`	`return getActualIndentationFromList((<TypeReferenceNode>node.parent).typeArguments);`
`211`	`211`	`}`
	`212`	`+ break;`
`212`	`213`	`case SyntaxKind.ObjectLiteral:`
`213`	`214`	`return getActualIndentationFromList((<ObjectLiteral>node.parent).properties);`
`214`	`215`	`case SyntaxKind.TypeLiteral:`