Skip to content

2022-09-07: daily merge of 22.0 into master

Adam Edward Barton requested to merge abarton/athena:sweep_22.0_master_2022-09-07 into master 
 Conflicts:
	Control/AthenaConfiguration/python/AllConfigFlags.py
	PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionCombined.cxx
	PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionFormula.cxx
	Simulation/Tests/ISF_ValidationMT/test/test_MC21a_FullG4MT_QS_Monopoles_CAvsCG.sh
	Tools/PyUtils/python/MetaReader.py
	Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx

Resolved by hand. I hope as intended.

Edited by Adam Edward Barton

Merge request reports