From 8b078c2734f9ce6b4fa3c5f212f966c5c0a27ba0 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 2 Dec 2014 08:46:33 -0800
Subject: [PATCH] baseline change conflict not caught during github merge

---
 .../reference/conditionalOperatorConditionIsObjectType.types    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
index 7887f71c2c..f99c591b59 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
@@ -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