Fixed SimPEG.__init__.py to include visulization (some merging issuse).

2026-07-08 19:29:00 +08:00 · 2013-11-11 09:47:35 -08:00
parent 4d0e532619
commit 2cbbb3639c
1 changed files with 0 additions and 4 deletions
@@ -2,10 +2,6 @@ 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