Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit 865039b4 authored by Plumtree3D's avatar Plumtree3D
Browse files

fix: rebased and fixed merge conflict

parent c826484a
No related branches found
No related tags found
1 merge request!80Resolve "Add badground color on sections in index"
This commit is part of merge request !80. Comments created here will be created in the context of that merge request.
......@@ -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>
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment