Skip to content

Update README.MD#11

Open
doilio wants to merge 2 commits intorealdm:masterfrom
doilio:patch-1
Open

Update README.MD#11
doilio wants to merge 2 commits intorealdm:masterfrom
doilio:patch-1

Conversation

@doilio
Copy link

@doilio doilio commented Oct 4, 2018

Some minor changes

Copy link
Contributor

@thatfiredev thatfiredev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Owner

@realdm realdm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like there is a merge conflict as @EdNgulele did similar changes on a previous PR.
Can you please address those before merging?

@thatfiredev
Copy link
Contributor

thatfiredev commented Oct 4, 2018

@doilio Just a tip: Use the web editor. Look for occurrences of <<<<<, ===== and >>>>>. The first part shows the code you're pushing, the second part shows the code that was already there. Choose one of the parts to keep and delete the other.

After that's done, remove all the <<<<<, ===== & >>>>> marks and then click on the commit button.

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.

3 participants