Closed airdrummingfool closed 5 years ago
Looking more closely, I deleted the wrong section in the merge conflict. I did something I swore never to do..I used the web conflict resolver :scream:
Hahaha, happens to us all :) I imagine that's a good rule-of-thumb... I've never tried github's conflict resolver, but then again, I'm quite partial to the one I use (p4merge).
Here's an updated PR that should merge cleanly. I had a feeling #5 was going to have some conflicts, sorry about that!