Closed Seth-Rothschild closed 6 years ago
@Seth-Rothschild I think the merge conflicts are things that we no longer care about - things that you rewrote in your refactor. Can you please confirm that? I'm happy to resolve the conflicts myself but I don't want to mess up.
nevermind. Rebased and all is good.
close #27