Compare commits

..

No commits in common. "f0254b15392cb1ab65e7694275b4f658c6e39bfb" and "a541a75b8f5127f6a54377dd658b256d8ad039ed" have entirely different histories.

View file

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