CyrusNajmabadi 122d8a4d98 Merge pull request #1456 from Microsoft/mergeMarkers ...

Make the compiler resilient to encountering merge conflict markers in a source code file.

2014-12-11 18:04:25 -08:00

..

baselines/reference

Merge pull request #1456 from Microsoft/mergeMarkers

2014-12-11 18:04:25 -08:00

cases

Merge pull request #1456 from Microsoft/mergeMarkers

2014-12-11 18:04:25 -08:00

webhost

…

perfsys.ts

…

perftsc.ts

…

test.bat

…

webTestResults.html

…

webTestServer.ts

…