fix auto-mismerge of #6294 and #6327 #6344
Merged
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.
#6327 added a block of
omdb nexus background-tasks show
output to theomdb
success cases expectorate file. But that PR was branched prior to #6294, which then landed before it. #6294 added a new background task, which changes that output. When #6327 was landed on "main", git saw no conflict, but the expectorate file was wrong and so tests are now failing on "main". This PR fixes that.