Fix merge conflict in advanced step workflow #18852
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
dannon
approved these changes
Sep 19, 2024
nsoranzo
reviewed
Sep 19, 2024
Comment on lines
-946
to
+949
| "19": { | ||
| "id": 19, | ||
| "20": { | ||
| "id": 20, |
There was a problem hiding this comment.
Should this be backported to release_24.1, as it was introduced in https://github.com/galaxyproject/galaxy/pull/18810/files#diff-bb81ba432ebe3591ccddfd36ab261ec668b57170ca10ed9c39acf727e2a17cbd ?
It doesn't seem to be a problem there, but also not correct.
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.
(Please replace this header with a description of your pull request. Please include BOTH what you did and why you made the changes. The "why" may simply be citing a relevant Galaxy issue.)
(If fixing a bug, please add any relevant error or traceback)
(For UI components, it is recommended to include screenshots or screencasts)
How to test the changes?
(Select all options that apply)
License