Fix auto merge conflict 5850 #5853
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
* Revert "Temporarily allow 3.3.1 for 3.3.0 shims. (NVIDIA#5693)" This reverts commit 53cfa49. * update shim330 dep to released spark 330 libs Signed-off-by: Peixin Li <pxli@nyu.edu> * drop 330 from snapshot section in buildall
Signed-off-by: Peixin Li <pxli@nyu.edu>
pxLi
requested review from
jlowe,
revans2,
tgravescs,
GaryShen2008,
NvTimLiu and
zhanga5
as code owners
|
build |
NvTimLiu
approved these changes
Jun 16, 2022
sameerz
added
the
task
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.
fix auto-merge conflict at #5850
NOTE: this must be merged as a merge commit