Closed RowanFerrabee closed 9 years ago
Nothing sorry that was a mistake
Since it seems like we can't merge this automatically and it's been a while, would you mind if we closed this?
Yeah, go ahead, I've just taken to editing the master directly cause my Git skills are just that bad.
I think you have to pull the most recent changes from Colin's repo into your own first to merge them.