Closed jonalmeida closed 8 years ago
What does this change? Seems like your other two PRs put together.
Whoops, one sec!
There we go! Forgot to push my changes :)
Could you rebase your branch onto the new commit you made for #35? It's trying to merge the old commit (check the diff).
Done!
Some of the whitespace and line endings got messed up so I did some changes and pushed to master. Thanks for the help.
Sorry, my editor removes trailing whitespaces.
Depends on #36 and #35 before merging.