From 47bd3c6c7c3b941b4c1d75d9007c72a9e4947368 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 25 Apr 2021 16:22:46 -0700 Subject: [PATCH] ok --- tgui/packages/common/collections.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tgui/packages/common/collections.ts b/tgui/packages/common/collections.ts index a8e558801b..7abe49ff23 100644 --- a/tgui/packages/common/collections.ts +++ b/tgui/packages/common/collections.ts @@ -173,7 +173,6 @@ export const sortBy = (...iterateeFns) => array => { export const sort = sortBy(); -<<<<<<< HEAD:tgui/packages/common/collections.ts /** * Returns a range of numbers from start to end, exclusively. * For example, range(0, 5) will return [0, 1, 2, 3, 4]. @@ -181,8 +180,6 @@ export const sort = sortBy(); export const range = (start: number, end: number): number[] => new Array(end - start).fill(null).map((_, index) => index + start); -======= ->>>>>>> citadel/master:tgui/packages/common/collections.js /** * A fast implementation of reduce. */ @@ -257,8 +254,6 @@ type Zip = { [I in keyof T]: T[I] extends (infer U)[] ? U : never; }[]; -export const uniq = uniqBy(); - /** * Creates an array of grouped elements, the first of which contains * the first elements of the given arrays, the second of which contains