From 6fca987edf53935b46d0617d2741d22b20526568 Mon Sep 17 00:00:00 2001
From: Kirill <kutuz.kirya.v.1.2.5@gmail.com>
Date: Wed, 19 Apr 2023 16:41:32 +0300
Subject: [PATCH] fix: conflicts

---
 src/handlers/account/index.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/handlers/account/index.ts b/src/handlers/account/index.ts
index 4c232c7..56f9a3f 100644
--- a/src/handlers/account/index.ts
+++ b/src/handlers/account/index.ts
@@ -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) => {