Compare commits
No commits in common. "f0254b15392cb1ab65e7694275b4f658c6e39bfb" and "a541a75b8f5127f6a54377dd658b256d8ad039ed" have entirely different histories.
f0254b1539
...
a541a75b8f
1 changed files with 1 additions and 21 deletions
22
src/index.ts
22
src/index.ts
|
@ -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",
|
||||||
|
|
Reference in a new issue