From f8d68d8ef01b81f6bc081f19870544a667a48c8b Mon Sep 17 00:00:00 2001
From: farbanas <arbanasfran@gmail.com>
Date: Tue, 2 May 2023 15:34:15 +0200
Subject: [PATCH] fix: merge resolve

---
 nym-wallet/src/context/main.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nym-wallet/src/context/main.tsx b/nym-wallet/src/context/main.tsx
index 383e598ad5..af965b79a0 100644
--- a/nym-wallet/src/context/main.tsx
+++ b/nym-wallet/src/context/main.tsx
@@ -64,10 +64,7 @@ export type TAppContext = {
   handleShowTerminal: () => void;
   signInWithPassword: (password: string) => void;
   logOut: () => void;
-<<<<<<< HEAD
-=======
   keepState: () => Promise<void>;
->>>>>>> master
   printBalance: string;
   printVestedBalance?: string; // spendable vested token
 };