- Two minor conflicts in the
PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMisspackage caused by manual sweep of !55324 (merged) into 22.0. Retained the master version of the code.
- Conflict generated by
Tools/PROCTools/data/x658_AOD_content.refwhich has been removed from master, but still exists in 22.0. Ignored 22.0 changes.
- Minor conflicts related to !55502 (merged) in two files:
Reconstruction/tauRec/python/TauToolHolder.py. Kept the master version of the code after discussion with the developers
Manual fixes have bee applied to two files
as per these instructions