chore(linux): Fix wrong merge #11224
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
The recent merge from `beta` into `master` introduced a problem when resolving merge conflicts, resulting in duplicate definition of `binary_packages_unreleased` which prevents the workflow from loading. This change rectifies the file.
User Test ResultsTest specification and instructions User tests are not required |
mcdurdin
approved these changes
Apr 15, 2024
|
Is this something to manually remove again when Sprint B17S6 gets merged back to master? |
|
Changes in this pull request will be available for download in Keyman version 18.0.19-alpha |
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.
The recent merge from
betaintomasterintroduced a problem when resolving merge conflicts, resulting in duplicate definition ofbinary_packages_unreleasedwhich prevents the workflow from loading. This change rectifies the file.@keymanapp-test-bot skip