fix merge issues

vladima · vladima · commit f18e20316a7a · 2015-11-30T20:41:12.000-08:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -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.
