fixing of merge conflict (53999afe) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

53999afe

Commit 53999afe authored 5 years ago by Catrin Bernius Committed by Adam Edward Barton 5 years ago

Downloads
- Patches
- Plain Diff

fixing of merge conflict

Merge remote-tracking branch 'upstream/master' into chainDefChange

parent 52720e55

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py 21 additions, 0 deletions

...TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py 26 additions, 20 deletions

...ggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py 29 additions, 40 deletions

...rCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py

with 76 additions and 60 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