merged master
This commit is contained in:
parent
f0254b1539
commit
56f469abcb
1 changed files with 0 additions and 13 deletions
13
src/index.ts
13
src/index.ts
|
@ -1,7 +1,6 @@
|
|||
import { User } from "./types";
|
||||
|
||||
const text = "This is Michael's Answer";
|
||||
<<<<<<< HEAD
|
||||
fdsafd
|
||||
AudioBufferSourceNodedsaf
|
||||
DataTransferdsaf
|
||||
|
@ -10,18 +9,6 @@ FormDataasf
|
|||
DataTransferdsa
|
||||
FileSystemDirectoryEntryafd
|
||||
sa
|
||||
=======
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
>>>>>>> master
|
||||
function getFromDb(): User[] {
|
||||
return [{
|
||||
name: "kfir",
|
||||
|
|
Reference in a new issue