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

Add MacGyver option #309

Merged
merged 1 commit into from
Dec 19, 2014
Merged

Add MacGyver option #309

merged 1 commit into from
Dec 19, 2014

Conversation

macflav
Copy link

@macflav macflav commented Dec 19, 2014

@casey-collab
Copy link
Contributor

Unfortunately, this pull request conflicts with another change. Can you resolve the merge conflicts locally and update the pull request?

@casey-collab
Copy link
Contributor

Besides my other comments, this looks good! Once you respond to those, this should be good to merge.

@macflav
Copy link
Author

macflav commented Dec 19, 2014

I can't tell why there's a conflict. All I did was add lines (no modifying nor deleting). Can anyone help? @casey-collab @salogel42

@casey-collab
Copy link
Contributor

Looks great! 🍭

casey-collab pushed a commit that referenced this pull request Dec 19, 2014
@casey-collab casey-collab merged commit d89a9cc into udacity:master Dec 19, 2014
@macflav
Copy link
Author

macflav commented Dec 19, 2014

This is really strange. I didn't change anything. All I did was add another comment here, and it worked.

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