resolving conflicts

Author: djarecka

nibabel/tests/test_spaces.py

@@ -122,4 +122,4 @@ def test_slice2volume():
 ])
 def test_slice2volume_exception(index, axis):
     with pytest.raises(ValueError):
-        slice2volume(index, axis)
+        slice2volume(index, axis)