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
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