From 56f469abcb37d234fcd76ddc56311cc0d3c7996c Mon Sep 17 00:00:00 2001
From: Kfir Dayan <kfda89@gmail.com>
Date: Mon, 11 Sep 2023 16:52:36 +0300
Subject: [PATCH] merged master

---
 src/index.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index eb6f468..4e84a0f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,6 @@
 import { User } from "./types";
 
 const text = "This is Michael's Answer";
-<<<<<<< HEAD
 fdsafd
 AudioBufferSourceNodedsaf
 DataTransferdsaf
@@ -10,18 +9,6 @@ FormDataasf
 DataTransferdsa
 FileSystemDirectoryEntryafd
 sa
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> master
 function getFromDb(): User[] {
   return [{
     name: "kfir",