Skip to content

Commit

Permalink
Fix cherry pick
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcarcell
jmcarcell committed Sep 22, 2024
1 parent f0bb0b3 commit 5db4947
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .cherry-pick
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff

# py-onnx: add a patch for the standard, remove after 1.15.0
git add .
git cherry-pick 8a7ff0d4c28bb8cfa5decd29c9234cd1773482ff -X theirs --no-commit
git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit


0 comments on commit 5db4947

Please sign in to comment.