merged master

This commit is contained in:
Kfir Dayan 2023-09-11 16:52:36 +03:00
parent f0254b1539
commit 56f469abcb

View file

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