Resolve merge conflict

LaurierHawkHacks · Mar 24, 2024 · fb22d28 · fb22d28
1 parent c9f44bd
commit fb22d28
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/src/assets/index.tsx b/src/assets/index.tsx
@@ -20,18 +20,6 @@ import {
     DevpostIcon,
 } from './social-icons';
 
-import HeroAboutDesktop from './hero-about/hero-about-desktop.svg';
-import HeroAboutMobile from './hero-about/hero-about-mobile.svg';
-import HeroAboutAirBalloon from './hero-about/about-air-balloon.svg';
-import HawkHacksLogo from './logo.svg';
-
-export {
-    HeroAboutDesktop,
-    HeroAboutMobile,
-    HeroAboutAirBalloon,
-    HawkHacksLogo,
-};
-
 export {
     MailIcon,
     LinkedInIcon,
@@ -43,17 +31,19 @@ export {
 
 /*
  *
- * About Section SVGs 
+ * Hero Section SVGs 
  * 
  */
-import AboutAirBalloon from './about/about-air-balloon.svg';
-import AboutSectionDesktop from './about/about-section-desktop.svg';
-import AboutSectionMobile from './about/about-section-mobile.svg';
+import HeroAboutDesktop from './hero-about/hero-about-desktop.svg';
+import HeroAboutMobile from './hero-about/hero-about-mobile.svg';
+import HeroAboutAirBalloon from './hero-about/about-air-balloon.svg';
+import HawkHacksLogo from './logo.svg';
 
-export { 
-    AboutAirBalloon, 
-    AboutSectionDesktop, 
-    AboutSectionMobile 
+export {
+    HeroAboutDesktop,
+    HeroAboutMobile,
+    HeroAboutAirBalloon,
+    HawkHacksLogo,
 };
 
 /*