Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Rebase with master #48
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
chuckbutler commentedAug 10, 2016
original Author: Cory Johns johnsca@gmail.com
This was a basis of cory's earlier work to resolve divergence between the
master branch and devel branch. This now yields a 2 line diff as of this
merge point.