Closed mroderick closed 5 years ago
@mroderick Merging this with all the prettier changes made a conflicting mess out of #237 (which no longer had any conflicts). Could we revert this, merge #237 and then re-merge (a rebased version of) this? I tried cleaning up by quickly resetting the branch, but it's protected (yeah, yeah, yeah), so I couldn't do this without anyone noticing ...
@mroderick Merging this with all the prettier changes made a conflicting mess out of #237 (which no longer had any conflicts). Could we revert this, merge #237 and then re-merge (a rebased version of) this? I tried cleaning up by quickly resetting the branch, but it's protected (yeah, yeah, yeah), so I couldn't do this without anyone noticing ...
Sure, go ahead!
Ha, seems @dominykas beat me to it, and actually fixed the conflicts.
This PR replaces #262, as dependabot doesn't know how to upgrade when new dependencies are needed.