Creating PR#34
Open
jmcreasman wants to merge 4 commits into
Open
Conversation
67 tasks
Contributor
Author
|
There was a lot of confusion on this in the whole class. I think I ran into some kind of merge conflict and I was able to resolve it because I merged this PR successfully... |
Merge upstream master to catch up patch-1
Merge patch-1 to catch up master
Contributor
Author
|
After fixing the merge conflict with cmauban |
This was referenced Sep 15, 2015
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GitHubbing to Know You
Updated local master from upstream:master
Resolved conflicts...? WHY!?
Created new issue in student-roster...