Skip to content
Snippets Groups Projects
Commit 5a74ab42 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge remote-tracking branch 'upstream/22.0' into master-sweepfrom22_17_10 

Manually fixed conflicts in several python scripts

Trivial fixes in:
* LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py
* LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py
* LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py

Manually propagated new additions from 22.0 into master in:
* PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationConfigList.py
* PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
parents 157a8011 f8a19747
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 425 additions and 1412 deletions
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