[POSTPONED] GitLab sender email address for notifications won't be changing effective Monday, March 4th at 17:30h. (ffi: OTG0148869)
Pseudomerge of BLS packages, see JIRA ATR-19003.
There were some general changes in master and many BLS specific changes in 21.0-TrigMC. From our point of view the master branch is really outdated. Thus we have resolved all conflicts in this way.
Update packages:TrigEffJpsiTools TrigBphysicsEvent TrigTopoEvent TrigTopoEventTPCnv TrigBphysHypo TrigEgammaMuonCombHypo TrigBphysMonitoring bphysics from upstream/21.0-TrigMC to upstream/master via pseudo-merge, using:
git-package-pseudomerge.py --packages Trigger/TrigAnalysis/TrigEffJpsiTools Trigger/TrigEvent/TrigBphysicsEvent Trigger/TrigEvent/TrigTopoEvent Trigger/TrigEvent/TrigTopoEventTPCnv Trigger/TrigHypothesis/TrigBphysHypo Trigger/TrigHypothesis/TrigEgammaMuonCombHypo Trigger/TrigMonitoring/TrigBphysMonitoring Trigger/TriggerCommon/TriggerMenu/python/bphysics --source upstream/21.0-TrigMC --target upstream/master --stage 1