Skip to content
Snippets Groups Projects
Commit 8c163ef8 authored by John Baines's avatar John Baines
Browse files

fix conflict due to addition of Atlas copyright

parents 6e84908b 0af798b7
No related branches found
No related tags found
9 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,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!20039Pseudomerge of FTK athena/Trigger packages from release 21 to master (part 1)
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 7 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