From 48e9365a05f8a9e46bf04e27462ddc15f770d88c Mon Sep 17 00:00:00 2001
From: MTG2000 <mtg0987654321@gmail.com>
Date: Thu, 15 Sep 2022 13:31:13 +0300
Subject: [PATCH] fix: remove merge comment

---
 .../Projects/pages/ExplorePage/Header/Header.tsx | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx
index 08981dc..c56ba10 100644
--- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx
+++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx
@@ -42,22 +42,6 @@ const headerLinks = [
       newTab: false,
     },
   },
-<<<<<<< HEAD
-  {
-    title:
-      <>
-        <p className="text-body1 font-bolder text-white">Take part in BOLT🔩FUN’s Shock the Web 2 ⚡️</p>
-        <p className="text-body3 font-medium text-white mt-8">16th - 19th June, 2022</p>
-      </>,
-    img: Assets.Images_ExploreHeader2,
-    link: {
-      content: "Register Now",
-      url: "https://bolt.fun/hackathons/shock-the-web-2/",
-      newTab: true,
-    },
-  },
-=======
->>>>>>> dev
 ];