Merge branch 'origin/master'

Conflicts: SimPEG/__init__.py
2026-07-29 11:27:23 +08:00 · 2013-11-11 09:25:51 -08:00
parent 0e03e51bd2 059ccd40b3
commit 4d0e532619
47 changed files with 6231 additions and 542 deletions
@@ -1,5 +1,11 @@
-import mesh
 import utils
+from utils import Solver
+import mesh
 import inverse
+<<<<<<< HEAD
 from Solver import Solver
 import visulize
+=======
+import forward
+import regularization
+>>>>>>> refs/remotes/origin/master