Skip to content

2023-06-28: merge of 23.0 into master

Some non trivial conflicts, took the 23.0 versions use Xours strategy. Not sure this is correct @averbyts

Conflicts:
	Generators/GeneratorFilters/src/xAODHTFilter.cxx
	Generators/GeneratorFilters/src/xAODMETFilter.cxx
	Generators/GeneratorFilters/src/xAODTruthParticleSlimmerMET.cxx

This sweep contains the following MRs:

Edited by Adam Edward Barton

Merge request reports