From 2cbbb3639c5adada3b6cf707ea706c597f0e0a94 Mon Sep 17 00:00:00 2001
From: Gudni Karl Rosenkjaer <gkrosen@gmail.com>
Date: Mon, 11 Nov 2013 09:47:35 -0800
Subject: [PATCH] Fixed SimPEG.__init__.py to include visulization (some
 merging issuse).

---
 SimPEG/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/SimPEG/__init__.py b/SimPEG/__init__.py
index f50e1cef..f4628b6e 100644
--- a/SimPEG/__init__.py
+++ b/SimPEG/__init__.py
@@ -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