PenaSide/tariffs
3
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Kirill 2023-04-19 16:41:32 +03:00
parent 5417777f10
commit 6fca987edf
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/handlers/account/index.ts
View File

@ -59,7 +59,6 @@ export const getAccountByID = async (request: GetAccountRequest, reply: FastifyR
} }
return account; return account;
<<<<<<< src/handlers/account/index.ts
}; };
export const getAccount = async (request: GetAccountRequest, reply: FastifyReply) => { export const getAccount = async (request: GetAccountRequest, reply: FastifyReply) => {
@ -76,8 +75,6 @@ export const getAccount = async (request: GetAccountRequest, reply: FastifyReply
} }
return account; return account;
=======
>>>>>>> src/handlers/account/index.ts
}; };
export const setAccountRole = async (request: SetAccountRoleRequest, reply: FastifyReply) => { export const setAccountRole = async (request: SetAccountRoleRequest, reply: FastifyReply) => {