fix: TUI merge conflict#379
Merged
thw26 merged 1 commit intoMar 11, 2025
Merged
Conversation
There was a typo in merge conflict resolution when merging FaithLife-Community#349 , this is the proper resolution. (See lines 489-493) Also fixed mypy warnings
thw26
approved these changes
Mar 11, 2025
This was referenced Mar 11, 2025
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
There was a typo in merge conflict resolution when merging #349 , this is the proper resolution. (See lines 489-493)
Also fixed mypy warnings