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

Merge branch 'staging' into 'dev'

Browse Source 
# Conflicts:
#   src/handlers/account/index.ts
This commit is contained in:
Kirill 2023-04-19 13:30:12 +00:00
commit 462dc9ea90
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ 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) => {
@ -75,6 +76,8 @@ 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) => {