Fix semantic merge conflict (microsoft#20119)

Andy · weswigham · commit 82502ea08682 · 2017-11-17T15:29:09.000-08:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1160,10 +1160,6 @@ namespace ts {
         return result;
     }
 
-    export function toArray<T>(value: T | ReadonlyArray<T>): ReadonlyArray<T> {
-        return isArray(value) ? value : [value];
-    }
-
     /**
      * Calls `callback` for each entry in the map, returning the first truthy result.
      * Use `map.forEach` instead for normal iteration.
@@ -1366,6 +1362,8 @@ namespace ts {
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
 
+    export function toArray<T>(value: T | ReadonlyArray<T>): ReadonlyArray<T>;
+    export function toArray<T>(value: T | T[]): T[];
     export function toArray<T>(value: T | T[]): T[] {
         return isArray(value) ? value : [value];
     }

Original file line number	Diff line number	Diff line change
`@@ -1160,10 +1160,6 @@ namespace ts {`
`1160`	`1160`	`return result;`
`1161`	`1161`	`}`
`1162`	`1162`
`1163`		`- export function toArray<T>(value: T \| ReadonlyArray<T>): ReadonlyArray<T> {`
`1164`		`- return isArray(value) ? value : [value];`
`1165`		`- }`
`1166`		`-`
`1167`	`1163`	`/**`
`1168`	`1164`	* Calls `callback` for each entry in the map, returning the first truthy result.
`1169`	`1165`	* Use `map.forEach` instead for normal iteration.
`@@ -1366,6 +1362,8 @@ namespace ts {`
`1366`	`1362`	`return Array.isArray ? Array.isArray(value) : value instanceof Array;`
`1367`	`1363`	`}`
`1368`	`1364`
	`1365`	`+ export function toArray<T>(value: T \| ReadonlyArray<T>): ReadonlyArray<T>;`
	`1366`	`+ export function toArray<T>(value: T \| T[]): T[];`
`1369`	`1367`	`export function toArray<T>(value: T \| T[]): T[] {`
`1370`	`1368`	`return isArray(value) ? value : [value];`
`1371`	`1369`	`}`