Skip to content

Daily "22.0 to master" sweep: 31/05/22

Johannes Elmsheuser requested to merge elmsheus/athena:update_31_05 into master

This is the manual sweep of MRs from the 22.0 branch to the master branch for 31/05/22

There has been a merge conflict which has been resolved be removing the following 4 files as discussed with @jojungge :

#	deleted by us:      MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.cxx
#	deleted by us:      MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
#	deleted by us:      MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.cxx
#	deleted by us:      MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCPRDVariables.h

Merge request reports