Footer change

HackRU · Aug 30, 2023 · 538e2a7 · 538e2a7
1 parent 47b1943
commit 538e2a7
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/components/_Landing/sections/footer/Footer.tsx b/src/components/_Landing/sections/footer/Footer.tsx
@@ -11,11 +11,7 @@ function Footer() {
     return (
         <div className="text-white flex flex-col items-center py-2">
             <div className="pb-4 flex-col justify-center">
-<<<<<<< HEAD
-                <div>
-=======
                 <div className="ml-1">
->>>>>>> fall-2023
                     <a href="mailto:[email protected]"
                         className="social-links"
                         target="_blank"
@@ -42,12 +38,8 @@ function Footer() {
                     </a>
                 </div>
                 <div>
-<<<<<<< HEAD
-                    <a className="text-subtitles  font-semibold pl-2" href="https://linktr.ee/thehackru">linktr.ee/thehackru</a>
-=======
                     <a className="text-subtitles  font-semibold"
                         href="https://linktr.ee/thehackru">linktr.ee/thehackru</a>
->>>>>>> fall-2023
 
                 </div>
             </div>