Skip to content
Snippets Groups Projects
Commit dd5d8142 authored by Sara Alderweireldt's avatar Sara Alderweireldt Committed by Atlas Nightlybuild
Browse files

Merge branch 'cherry-pick-1448b8cdc8-21.1' into '21.1' 

Sweeping !14450 from 21.1-dev to 21.1.
Fix bug whereby a histogram plotted twice would be modifed twice

See merge request atlas/athena!14480

(cherry picked from commit 2b6b5ea9cf41700257b0d561ceea878916f3a5e9)

590c0ff2 Merge branch '21.1-dev-tida-obj' into '21.1-dev'
parent a33f34cb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Control/DataModelRoot/DataModelRoot/ATLAS_CHECK_THREAD_SAFETY 100755 → 100644
+ 0
− 0
View file @ dd5d8142
File mode changed from 100755 to 100644
Event/EventContainers/test/ID_ContainerTest.h 100644 → 100755
+ 0
− 0
View file @ dd5d8142
File mode changed from 100644 to 100755
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment