fix: remove merge comment

This commit is contained in:
MTG2000
2022-09-15 13:31:13 +03:00
parent 47e65adb67
commit 48e9365a05

View File

@@ -42,22 +42,6 @@ const headerLinks = [
newTab: false,
},
},
<<<<<<< HEAD
{
title:
<>
<p className="text-body1 font-bolder text-white">Take part in BOLT🔩FUNs 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
];