Skip to content
Snippets Groups Projects
Commit 478ccb40 authored by imcovangent's avatar imcovangent
Browse files

Merge branch 'CPACS_MCG__Andreas' 

# Conflicts:
#	.idea/workspace.xml
#	pyKADMOS/AGILE_EY01_DEMO.py
#	pyKADMOS/MDOproblem.pyc
#	pyKADMOS/MDOstatic.pyc
parents b3d412e5 4f707062
No related branches found
No related tags found
No related merge requests found
Pipeline #192454 canceled
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 59 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