Skip to content
Snippets Groups Projects
Commit 735ecc42 authored by jmcchesn's avatar jmcchesn
Browse files

Merge branch 'main' into 'diverge' 

# Conflicts:
#   iexcode/instruments/ARPES.py
#   iexcode/instruments/Octupole.py
parents 35e51424 8c7a2907
No related branches found
No related tags found
1 merge request!8Diverge
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 451 additions and 289 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