Skip to content
Snippets Groups Projects
Commit eb8a7463 authored by Claudio Scafuri's avatar Claudio Scafuri :speech_balloon:
Browse files

Merge branch 'main' into 'development' 

# Conflicts:
#   TODO
#   src/E2Sextupole.cpp
#   src/E2Sextupole.h
#   src/E2Sextupole.xmi
#   src/main.cpp
parents e0b88a95 8aeb79e1
No related branches found
No related tags found
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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