merge marker removed from test.ts

tedeh · Jun 26, 2021 · a034058 · a034058
1 parent 3495ffc
commit a034058
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/typescript/test.ts b/typescript/test.ts
@@ -833,4 +833,3 @@ export async function test_websocket_Promise () {
 
   const result = await websocketClient.request('add', [1,2,3]);
 }
->>>>>>> websocket