fix(common/models): fixes reference dropped by git merge#7313
Merged
fix(common/models): fixes reference dropped by git merge#7313
Conversation
User Test ResultsTest specification and instructions User tests are not required |
mcdurdin
approved these changes
Sep 19, 2022
Collaborator
|
Changes in this pull request will be available for download in Keyman version 16.0.67-alpha |
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
3 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.
Fixes a post-merge issue caused when merging both of the following two PRs:
From #7205:
Note the original line 165:
This line is referenced by #7241:
Due to the way the changes were made, this was not detected as a merge conflict, allowing this to slip through:
Fortunately, it's a very easy "conflict" to resolve.
@keymanapp-test-bot skip