Removed merge artifact.

theano/sandbox/linalg/tests/test_linalg.py

@@ -540,14 +540,9 @@ class test_Eigh(test_Eig):
 class test_Eigh_float32(test_Eigh):
     dtype = 'float32'
 
-
 def test_matrix_inverse_solve():
     if not imported_scipy:
-<<<<<<< refs/remotes/upstream/master
         raise SkipTest("Scipy needed for the Solve op.")
-=======
-        return
->>>>>>> HEAD~4
     A = theano.tensor.dmatrix('A')
     b = theano.tensor.dmatrix('b')
     node = matrix_inverse(A).dot(b).owner