merged master

This commit is contained in:
Kfir Dayan 2023-09-11 16:49:46 +03:00
commit f0254b1539

View file

@ -1,6 +1,7 @@
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
@ -9,6 +10,18 @@ FormDataasf
DataTransferdsa DataTransferdsa
FileSystemDirectoryEntryafd FileSystemDirectoryEntryafd
sa sa
=======
>>>>>>> master
function getFromDb(): User[] { function getFromDb(): User[] {
return [{ return [{
name: "kfir", name: "kfir",