fix eslint errors after merge
fix eslint errors after merge

weswigham/TypeScript,weswigham/TypeScript,RyanCavanaugh/TypeScript,Microsoft/TypeScript,alexeagle/TypeScript,nojvek/TypeScript,SaschaNaz/TypeScript,kpreisser/TypeScript,minestarks/TypeScript,alexeagle/TypeScript,kitsonk/TypeScript,RyanCavanaugh/TypeScript,minestarks/TypeScript,SaschaNaz/TypeScript,Microsoft/TypeScript,nojvek/TypeScript,minestarks/TypeScript,SaschaNaz/TypeScript,RyanCavanaugh/TypeScript,kitsonk/TypeScript,kpreisser/TypeScript,nojvek/TypeScript,weswigham/TypeScript,nojvek/TypeScript,SaschaNaz/TypeScript,microsoft/TypeScript,kpreisser/TypeScript,microsoft/TypeScript,microsoft/TypeScript,Microsoft/TypeScript,kitsonk/TypeScript,alexeagle/TypeScript