Skip to content
Snippets Groups Projects
Commit fca8bf01 authored by Daniele Manuzzi's avatar Daniele Manuzzi
Browse files

Merge branch 'master' into 'dmanuzzi_CALO_DD4HEP'

# Conflicts:
#   compact/before-rich1-geom-update-26052022/checksums
#   compact/trunk/HCAL/detector.xml
#   compact/trunk/checksums
parents cba7f6e1 a869bac0
No related branches found
Tags 0.14.0
No related merge requests found
Pipeline #6113240 failed with stages
in 6 minutes and 59 seconds
Showing
with 337 additions and 162 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment