Clean-up utilities

bryphe-coder · bryphe-coder · commit e5e02f95617f · 2022-01-22T05:14:40.000Z
diff --git a/site/api.ts b/site/api.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { wait } from "./util"
 
 // TEMPORARY
@@ -103,8 +102,7 @@ export namespace Workspace {
     return Promise.resolve("test-workspace")
   }
 }
-||||||| 36b7b20
-=======
+
 interface LoginResponse {
   session_token: string
 }
@@ -127,5 +125,4 @@ export const login = async (email: string, password: string): Promise<LoginRespo
   }
 
   return body
-}
->>>>>>> main
+}
diff --git a/site/util/array.ts b/site/util/array.ts
diff --git a/site/util/index.ts b/site/util/index.ts
@@ -1,2 +1,2 @@
-export * from "./firstOrOnly"
+export * from "./array"
 export * from "./promise"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`import { wait } from "./util"`
`3`	`2`
`4`	`3`	`// TEMPORARY`
`@@ -103,8 +102,7 @@ export namespace Workspace {`
`103`	`102`	`return Promise.resolve("test-workspace")`
`104`	`103`	`}`
`105`	`104`	`}`
`106`		`-\|\|\|\|\|\|\| 36b7b20`
`107`		`-=======`
	`105`	`+`
`108`	`106`	`interface LoginResponse {`
`109`	`107`	`session_token: string`
`110`	`108`	`}`
`@@ -127,5 +125,4 @@ export const login = async (email: string, password: string): Promise<LoginRespo`
`127`	`125`	`}`
`128`	`126`
`129`	`127`	`return body`
`130`		`-}`
`131`		`->>>>>>> main`
	`128`	`+}`