Anders Hejlsberg ad1c9b91e5 Fix merge issue

2016-09-06 18:26:09 -07:00

..

compiler

Fix merge issue

2016-09-06 18:26:09 -07:00

harness

Merge branch 'master' of https://github.com/microsoft/TypeScript

2016-09-06 17:14:36 -07:00

lib

Merge pull request #10027 from maiermic/type-guards-in-Array.prototype.filter

2016-09-06 12:59:29 -07:00

server

Add a rule to toggle space after opening brace and before closing brace (#10447)

2016-09-06 16:15:13 -07:00

services

Merge branch 'master' of https://github.com/microsoft/TypeScript

2016-09-06 17:14:36 -07:00