fix: conflicts

This commit is contained in:
Kirill 2023-04-19 16:41:32 +03:00
parent 5417777f10
commit 6fca987edf

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