Skip to content

Commit

Permalink
Add a cherry pick for madgraph5amc
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell committed Oct 7, 2024
1 parent f82abf7 commit 10018f4
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .cherry-pick
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ git cherry-pick bb9bbeecad68dcc1e14211fa7940d26df663aaea -X theirs --no-commit
# py-lxml: add version 5.3.0, remove when https://github.com/spack/spack/pull/46771 is merged
git cherry-pick bbb97dfb9b976e588ad63b19cd401788c9d6e5bc -X theirs --no-commit

# madgraph5amc: add v3.5.6, remove when https://github.com/spack/spack/pull/46844 is merged
git cherry-pick 5777576e37ee28d674e2520d3f10b3f651a7680e -X theirs --no-commit


# Versions for the release, in order DD4hep and podio&edm4hep and LCIO
git cherry-pick 43d1cdb0bd4780bff369dafa681a8a7939313784 -X theirs --no-commit
git cherry-pick 5d9c534018593fdef5db1028c60026d26bf4d65b -X theirs --no-commit
Expand Down

0 comments on commit 10018f4

Please sign in to comment.