search

SheCodeAfrica-Nairobi / SheCodeAfrica-Nairobi-Website

The new open source website for SheCodeNairobi website 🥳
18 stars 25 forks source link

hero section images #16

Closed mevolkan closed 2 years ago

mevolkan commented 2 years ago

Related to issue #7

katungi commented 2 years ago

Hey @mevolkan , is it possible to fix the merge conflicts on your side? If not, it's okay, I'll do it on my side. I asked because I saw you merged the develop branch so it's easier if you fix the conflicts on your side 😅

mevolkan commented 2 years ago

Hi @katungi ,

I have resolved a conflict, it was an import of the Navbar component, it is okay to proceed now.