Closed birkenfeld closed 10 months ago
It says macros.rs has merge conflicts. I pulled it locally and don't see any, but there's nothing I can do from here. @birkenfeld will have to squash and rebase on their end. Sorry if you got spammed with my auto-merge stuff while I was trying to figure things out. This is ready to go when the conflicts are resolved.
Fixes #53 and now #54