fix: edit main.js

DaleStudy · Jun 26, 2024 · 121a116 · 121a116
1 parent c5c54fd
commit 121a116
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/main.js b/main.js
@@ -1,12 +1,7 @@
 import "./components/button-link.js";
 import "./components/footer-link/footer-link.js";
 import "./components/header.js";
-<<<<<<< HEAD
 import "./components/hero.js";
-import "./components/button-link.js";
-=======
-import "./components/hero/hero.js";
 import "./components/image.js";
->>>>>>> 7244af8 (fix : adjust the new component writting styles and apply feedback provided)
 import "./components/review-item/review-item.js";
 import "./components/seo-meta-tag/seo-meta-tag.js";