fix bad merge resolution

Author: awaelchli

tests/tests_fabric/conftest.py

@@ -105,6 +105,7 @@ def thread_police_duuu_daaa_duuu_daaa():
             thread.name == "QueueFeederThread"  # tensorboardX
             or thread.name == "QueueManagerThread"  # torch.compile
             or "(_read_thread)" in thread.name  # torch.compile
+        ):
             thread.join(timeout=20)
         elif (
             sys.version_info >= (3, 9)