Skip to content
Snippets Groups Projects
Commit 2d1c20a4 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master-dq-cosmics-hlt' into 'master' 

Fix new/old-style configurations merging failures in cosmics and MC

See merge request !37480
parents e126d2e7 3175bd35
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!37480Fix new/old-style configurations merging failures in cosmics and MC
Hide whitespace changes
Inline Side-by-side
Showing
with 299 additions and 284 deletions
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