anothe conflict fix

2022-09-21 17:41:31 +02:00
parent 0de6a0f1ca
commit af1bf57f24
1 changed files with 0 additions and 4 deletions
@@ -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