From af1bf57f24d17adb28873df0d9280843dfeec1c7 Mon Sep 17 00:00:00 2001
From: Gala <calero.vg@gmail.com>
Date: Wed, 21 Sep 2022 17:41:31 +0200
Subject: [PATCH] anothe conflict fix

---
 nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx b/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
index d6312211c6..fe74699dcf 100644
--- a/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
+++ b/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
@@ -157,11 +157,7 @@ const AmountFormData = ({
 
   return (
     <Stack gap={3}>
-<<<<<<< HEAD
       <Box display="flex" gap={3} justifyContent="center">
-=======
-      <Box display="flex" gap={3} justifyContent="center" sx={{ mt: 2 }}>
->>>>>>> develop
         {hasVestingTokens && <TokenPoolSelector disabled={false} onSelect={(pool) => setValue('tokenPool', pool)} />}
         <CurrencyFormField
           required