Merge conflict fix #1859
Merged
Merge conflict fix #1859
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
Contributor
DameryDad
commented
Nov 9, 2023
•
DameryDad
commented
- Done a reverse merge from the Roll20 Master, and then reapplied my updates. Seems to have resolved the conflicts (which seem to have come about with something to do with Adding hooks to allow token resizing on image change #1858. All good now.
* Fixed hyphenation of database items linked by %{...|...} inclusions.
* Fixed Rogue backstab to-hit adjustment.
* Fixed Staff of Frost. * A number of database fixes. * Fixed case match error on SpellsPerLevel table.
Alicekb
approved these changes
Nov 14, 2023
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.