Closed mangecoeur closed 8 years ago
So turns out the merge conflicts I thought I'd fixed after rebasing weren't as fixed as they should have been. Sorry about that - this version should address that.
No problem! I managed to get myself into merge hell last Friday, too.
With apologies: cleanup glitches from rebase + merge that slipped through :S