resolve merge conflicts

This commit is contained in:
Vladimir Matveev
2014-09-16 11:27:58 -07:00
parent f3aba2177e
commit 08f446ddf7
2 changed files with 2 additions and 1 deletions

View File

@@ -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: