Skip to content
Snippets Groups Projects
Commit 7c42ee0a authored by imcovangent's avatar imcovangent
Browse files

Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos 

# Conflicts:
#	pyKADMOS/scripts/AGILE_EY01_DEMO.py
#	pyKADMOS/scripts/sellarProblem.py
parents ebcc5391 b646e19f
No related branches found
No related tags found
No related merge requests found
Pipeline #192642 canceled
Stage: build
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 655 additions and 1 deletion
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