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

Contributing to issue #6, added more funnies #19

Merged
merged 7 commits into from
Oct 28, 2016
Merged

Contributing to issue #6, added more funnies #19

merged 7 commits into from
Oct 28, 2016

Conversation

bronwynbiro
Copy link
Contributor

Let me know if you don't like some of them or want any changes!

Let me know if you don't line some of them or want any changes!
Contributing to issue #6, added more funnies
@1egoman
Copy link
Owner

1egoman commented Oct 17, 2016

@bronwynbiro It seems you forgot a comma in the file:

screen shot 2016-10-17 at 6 44 55 am

Can you update that as well as fix the merge conflict? Thanks!

@1egoman 1egoman merged commit 02c672a into 1egoman:master Oct 28, 2016
@1egoman
Copy link
Owner

1egoman commented Oct 28, 2016

@bronwynbiro Thanks! 😄

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.

2 participants