maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

baseline change conflict not caught during github merge

Browse source
This commit is contained in:
Sheetal Nandi 2014-12-02 08:46:33 -08:00
parent 802f11349f
commit 8b078c2734
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
View file

@ -180,7 +180,7 @@ condObject.valueOf() ? exprIsObject1 : exprIsObject2;
new Date() ? exprString1 : exprBoolean1; // union
>new Date() ? exprString1 : exprBoolean1 : string | boolean
>new Date() : Date
>Date : { (): string; new (): Date; new (value: number): Date; new (value: string): Date; new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; prototype: Date; parse(s: string): number; UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; now(): number; }
>Date : DateConstructor
>exprString1 : string
>exprBoolean1 : boolean