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

Conga Line #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conga Line #34

wants to merge 2 commits into from

Conversation

natdudley
Copy link

Bears getting their party on

Bears getting their party on
@ammeep
Copy link
Contributor

ammeep commented Mar 30, 2014

Yay!
Really want to merge this in but we have a merge conflict. If you want, I am chilling in the Ruby room - I can help you fix this up 👍

Otherwise if you want to try and to fix it up on your own, try following the instructions here to update your fork with the changes in upstream https://help.github.com/articles/syncing-a-fork

Either way is fine - lemmie know 👍

stoked

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