merged master

Michaeldsaf
Michael
2023-09-11 16:49:46 +03:00 · 2023-09-11 16:48:27 +03:00 · 2023-09-11 16:46:55 +03:00 · 2023-09-11 16:45:12 +03:00
1 changed files with 21 additions and 1 deletions
--- a/src/index.ts
+++ b/src/index.ts
@ -1,7 +1,27 @@
 import { User } from "./types";

-const text = "This is the new text ";
+const text = "This is Michael's Answer";
+<<<<<<< HEAD
+fdsafd
+AudioBufferSourceNodedsaf
+DataTransferdsaf
+DataTransferfdsa
+FormDataasf
+DataTransferdsa
+FileSystemDirectoryEntryafd
+sa
+=======

+
+
+
+
+
+
+
+
+
+>>>>>>> master
 function getFromDb(): User[] {
  return [{
    name: "kfir",
Author	SHA1	Message	Date
Kfir Dayan	f0254b1539	merged master	2023-09-11 16:49:46 +03:00
Kfir Dayan	3aecd4f3df	Michaeldsaf	2023-09-11 16:48:27 +03:00
Kfir Dayan	410a89a850	Michael	2023-09-11 16:46:55 +03:00
Kfir Dayan	a32d51d8cd	Michael	2023-09-11 16:45:12 +03:00