fix: merge

shapeshift · Jun 7, 2024 · 96f010a · 96f010a
1 parent 1e99852
commit 96f010a
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/pages/RFOX/RFOX.tsx b/src/pages/RFOX/RFOX.tsx
@@ -82,16 +82,6 @@ const FormHeader: React.FC<FormHeaderProps> = ({ setStepIndex, activeIndex }) =>
       >
         {translate('RFOX.changeAddress')}
       </FormHeaderTab>
-<<<<<<< HEAD
-      <FormHeaderTab
-        index={RfoxTabIndex.Bridge}
-        onClick={handleClick}
-        isActive={activeIndex === RfoxTabIndex.Bridge}
-      >
-        {translate('RFOX.bridge')}
-      </FormHeaderTab>
-=======
->>>>>>> 1a8381debe (feat: remove dummy brige quote and wire-up from stake)
     </Flex>
   )
 }