Skip to content
Snippets Groups Projects
Commit 20a2c0c0 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'scottHvscaleFixResolved' into 'master' 

Resolve conflicting changes of LArHVScaleCorrCondAlg

See merge request atlas/athena!15854
parents 88eecfc6 fd78960e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment