Skip to content

2022-06-30: daily merge of 22.0 into master

Adam Edward Barton requested to merge abarton/athena:master_22.0_June30 into master 
 Conflicts:
	Projects/AthDataQuality/version.txt
	Projects/AthSimulation/version.txt
	Projects/Athena/version.txt
	Projects/DetCommon/version.txt
	Projects/VP1Light/version.txt
	Tools/WorkflowTestRunner/python/References.py
	Tracking/TrkEventCnv/TrkEventCnvTools/python/TrkEventCnvToolsConfigCA.py
	Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerToolRun3.h
Edited by Adam Edward Barton

Merge request reports