This is a duplicate of #61, where I have manually fixed merge conflicts to enable merging. That PR was approved and tested, so I have not duplicated any testing.
I tried resolving directly via Github, but unfortunately because the PR is in a forked repo and directly on master, the merge conflict would have to be committed directly into master.
The only associated changes I have made were:
Remove the Cargo.toml version update
Updated the CHANGELOG
Thanks for the work on this one @Sawchord and @redpfire :)
maor1993
commented
1 year ago
This is a duplicate of #61, where I have manually fixed merge conflicts to enable merging. That PR was approved and tested, so I have not duplicated any testing.
I tried resolving directly via Github, but unfortunately because the PR is in a forked repo and directly on
master, the merge conflict would have to be committed directly intomaster.The only associated changes I have made were:
Thanks for the work on this one @Sawchord and @redpfire :)
Closes #61
@eldruin mind signing off on this one for me?