From 6d3d3e4b685687c79f0b9debc1774d64fbbb6a33 Mon Sep 17 00:00:00 2001
From: bpinsard <basile.pinsard@gmail.com>
Date: Tue, 15 Aug 2023 12:26:04 -0400
Subject: [PATCH] fix flake8 tests

---
 niworkflows/interfaces/tests/test_bids.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/niworkflows/interfaces/tests/test_bids.py b/niworkflows/interfaces/tests/test_bids.py
index 365a62356a8..007c943d60e 100644
--- a/niworkflows/interfaces/tests/test_bids.py
+++ b/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