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

fixed broken logo image and profile image #72

Merged
merged 4 commits into from Oct 2, 2019
Merged

fixed broken logo image and profile image #72

merged 4 commits into from Oct 2, 2019

Conversation

rcode321
Copy link
Contributor

@rcode321 rcode321 commented Oct 1, 2019

Fixed the logo image and profile image.

@BennyCarlsson
Copy link
Owner

Great however it seems like you used an auto formatter and that usually ends up with bad merge conflicts :)

@rcode321
Copy link
Contributor Author

rcode321 commented Oct 1, 2019

Hi Benny how to resolve merge conflicts? i'm new with github, but i'll try to research it first how to resolve it tnx.

@BennyCarlsson
Copy link
Owner

Hi @rcode321 don't worry we all been new to something :)
here is a video from last year on how to solve a merge conflict https://www.youtube.com/watch?v=zOx5PJTY8CI

You can also make a completely new pull request if that is easier :)

@rcode321
Copy link
Contributor Author

rcode321 commented Oct 2, 2019

Hi Benny Thanks for the feedback, the video is really helpful. and I tried to fix the merge conflicts hope it's fixed.

@BennyCarlsson
Copy link
Owner

Great work! 👍

@BennyCarlsson BennyCarlsson merged commit e2665d8 into BennyCarlsson:master Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants