fix flake8 tests

Author: bpinsard

niworkflows/interfaces/tests/test_bids.py

@@ -300,7 +300,11 @@ def test_DerivativesDataSink_build_path(
         **entities,
     )
 
+<<<<<<< HEAD
     if isinstance(expectation, type):
+=======
+    if type(expectation) is type(Exception):
+>>>>>>> 601d1d1f (fix flake8 tests)
         with pytest.raises(expectation):
             dds.run()
         return