src/index.ts

@@ -1,27 +1,7 @@
 import { User } from "./types";
 
-const text = "This is Michael's Answer";
-<<<<<<< HEAD
-fdsafd
-AudioBufferSourceNodedsaf
-DataTransferdsaf
-DataTransferfdsa
-FormDataasf
-DataTransferdsa
-FileSystemDirectoryEntryafd
-sa
-=======
+const text = "This is the new text ";
 
-
-
-
-
-
-
-
-
-
->>>>>>> master
 function getFromDb(): User[] {
   return [{
     name: "kfir",