merged master
This commit is contained in:
commit
f0254b1539
1 changed files with 13 additions and 0 deletions
13
src/index.ts
13
src/index.ts
|
@ -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",
|
||||||
|
|
Reference in a new issue