JetSubStructureMomentTools: fixing merge conflicts for MR 21290 (!22696) · Merge requests · atlas / athena · GitLab

Please be advised that registry.cern.ch registry (Registry Service) will be unavailable next Monday, March 10th starting at 08:00h (Geneva time) for a short period of time. This may cause temporary disruptions to your workflows. Further information: OTG0154905

Jason Robert Veatch requested to merge jveatch/athena:master-ECFG-flag into master Apr 15, 2019

This is a manual cherry-pick of !21290 (merged) that resolves the merge conflicts in master.