Closed MasterOdin closed 6 years ago
Oops, I somehow missed this one. Please resolve the conflicts and I'll merge, thanks!
Conflicts should have already been fixed?
GitHub somehow still shows as conflict.
Hard refresh your page? I merged master and fixed the merge conflict in 439ac04 in my fork.
The default rebase action didn't work, but squash works :)
Thanks again!
Closes #62.