Skip to content

Commit

Permalink
Merge branch 'master' into json
Browse files Browse the repository at this point in the history
  • Loading branch information
mbkumar committed Jun 12, 2022
2 parents a32cbda + 44e9e5f commit dc810ca
Show file tree
Hide file tree
Showing 3 changed files with 355 additions and 68 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ docs/build/
# IDE related
.idea
compile_commands.json
.vscode

# Tests output
tests/*.dat
tests/boundary*

# Version file
src/simsopt/_version.py
src/simsopt/_version.py
Loading

0 comments on commit dc810ca

Please sign in to comment.