fix merge issues

This commit is contained in:
Vladimir Matveev 2015-11-30 20:41:12 -08:00
parent 0d0de5ac48
commit f18e20316a

View File

@ -74,11 +74,6 @@ namespace ts {
GreaterThan = 1
}
/* @internal */
export function isArray(obj: any): boolean {
return Array.isArray ? Array.isArray(obj) : typeof obj === "object" && obj instanceof Array;
}
/**
* Iterates through 'array' by index and performs the callback on each element of array until the callback
* returns a truthy value, then returns that value.