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 some typos #24

Merged
merged 6 commits into from
May 24, 2017
Merged

fixed some typos #24

merged 6 commits into from
May 24, 2017

Conversation

BlackScorp
Copy link
Contributor

No description provided.

@morevnaproject
Copy link
Collaborator

@BlackScorp Can you please resolve conflicts respectively to latest commits in master bransh?

@BlackScorp
Copy link
Contributor Author

ah sorry, when i wrote my changes you merged the other branch :D will do this today afternoon

# Conflicts:
#	pepper-and-carrot-ep6.msrt
@BlackScorp
Copy link
Contributor Author

@morevnaproject done

@morevnaproject morevnaproject merged commit a961e97 into morevnaproject-org:master May 24, 2017
@morevnaproject
Copy link
Collaborator

Thank you! ^__^

morevnaproject added a commit that referenced this pull request Apr 3, 2018
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

2 participants