mirror of
https://github.com/wassname/simpeg.git
synced 2026-08-12 12:30:37 +08:00
Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into BoundConstraint
Conflicts: .gitignore SimPEG/utils/__init__.py
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
*.pyc
|
||||
*.so
|
||||
*.sublime-project
|
||||
*.sublime-workspace
|
||||
docs/_build/
|
||||
myNotebooks/*
|
||||
|
||||
Reference in New Issue
Block a user