From 865039b4f61a341462c0c14cb8988415e702a287 Mon Sep 17 00:00:00 2001 From: Plumtree3D <ham.in.kneesocks@gmail.com> Date: Wed, 5 Oct 2022 09:45:40 +0200 Subject: [PATCH] fix: rebased and fixed merge conflict --- src/pages/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/pages/index.js b/src/pages/index.js index f54475b..02b73ad 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -37,12 +37,8 @@ export default function Home() { <main> <HomepagePromises /> <HomepageFeatures /> -<<<<<<< HEAD <CarouselLibre/> <HomepageResults /> -======= - <CarouselLibre /> ->>>>>>> 1635665 (refactor: :art: fixed consistency issue with sections) </main> </Layout> ); -- GitLab