Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hero section images #16

Merged
merged 33 commits into from Jul 4, 2022
Merged

hero section images #16

merged 33 commits into from Jul 4, 2022

Conversation

mevolkan
Copy link
Contributor

@mevolkan mevolkan commented Jun 22, 2022

Related to issue #7

@mevolkan mevolkan closed this Jun 24, 2022
@mevolkan mevolkan reopened this Jun 24, 2022
@katungi
Copy link
Collaborator

katungi commented Jun 28, 2022

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
Copy link
Contributor Author

Hi @katungi ,

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

@katungi katungi merged commit 9260454 into SheCodeAfrica-Nairobi:main Jul 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants