Merge branch 'cherry-pick-83e3bd28' into '21.0' (722fa5be) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

722fa5be

Commit 722fa5be authored 7 years ago by Hass AbouZeid

Downloads
- Plain Diff

Merge branch 'cherry-pick-83e3bd28' into '21.0'

Merge branch 'TM-May23' into '21.1' -- push to 21.0

See merge request !2421

parents 62df753a 6c11fcf2

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py 5 additions, 6 deletions

...r/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml 10 additions, 12 deletions

...TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml 10 additions, 12 deletions

...erCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml

with 25 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment