Chore: remove merge symbols

team-byof · May 20, 2023 · f5c6aa4 · f5c6aa4
1 parent 3b0d902
commit f5c6aa4
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/pages/swap.tsx b/src/pages/swap.tsx
@@ -11,12 +11,8 @@ import EtherIcon from "../../public/svgs/Ether.svg";
 import MaticIcon from "../../public/svgs/Matic.svg";
 import UpArrow from "../../public/svgs/UpArrow.svg";
 import DownArrow from "../../public/svgs/DownArrow.svg";
-<<<<<<< HEAD:src/pages/send.tsx
-import { useRouter } from "next/navigation";
 import Script from "next/script";
-=======
 import { useRouter } from "next/router";
->>>>>>> main:src/pages/swap.tsx
 
 const Swap = () => {
   const [value, setValue] = useState(0);
@@ -102,18 +98,14 @@ const Swap = () => {
       </GasFeeContainer>
       <SubmitBtn
         onClick={() => {
-<<<<<<< HEAD:src/pages/send.tsx
-          router.push("/status");
-          setIsClicked(!isClicked);
-=======
           router.push("/confirm", {
             pathname: "/confirm",
             query: {
               matic,
               eth,
             },
           });
->>>>>>> main:src/pages/swap.tsx
+          setIsClicked(!isClicked);
         }}
 
       >