Closed michealbenedict closed 10 years ago
Hmm. This still doesn't seem to be mergeable on our end. I would do a fresh checkout and reapply the additions in.
and a lot of unrelated changes
Oh dear, I am simply messing this up. I had not pulled in the latest master when I had created this branch :/. I am so sorry, let me just create a new PR.
You don't have to create new PRs. Just fix it locally and force push to this remote branch ;)
This should be good to merge to master.