Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

7a93e717

Commit 7a93e717 authored 5 years ago by Adam Edward Barton

Downloads
- Plain Diff

Merge branch 'test-of-sequences-merging' into 'master'

Fixes sequences merging in ComponentAccumulator

See merge request atlas/athena!23410

parents 1c2f242c 175f313d

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Control/AthenaConfiguration/python/ComponentAccumulator.py 39 additions, 11 deletions

Control/AthenaConfiguration/python/ComponentAccumulator.py
Control/AthenaConfiguration/python/ComponentAccumulatorTest.py 46 additions, 1 deletion

...ol/AthenaConfiguration/python/ComponentAccumulatorTest.py
Control/AthenaConfiguration/python/MainServicesConfig.py 2 additions, 2 deletions

Control/AthenaConfiguration/python/MainServicesConfig.py

with 87 additions and 14 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