Skip to content
Snippets Groups Projects
Forked from atlas / athena
31065 commits behind, 3 commits ahead of the upstream repository.
Vakho Tsulaia's avatar
Vakhtang Tsulaia authored
Conflicts:
* Calorimeter/CaloRec/python/CaloConfigFlags.py
* ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcLEDAnalysisTool.cxx
* Generators/Hijing_i/src/Hijing.cxx
* Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py

Reverted commit 80fffe75 (!65748) which was not supposed to be merged into the main.
7a29fedd
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.