Feature/alternate settings #114
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey, any update on this PR? |
eldruin
approved these changes
Apr 24, 2023
There was a problem hiding this comment.
Thank you for picking this up @ryan-summers and to everyone involved in this!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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?