fix for 3104

Parsl · Mar 5, 2024 · 019f4a7 · 019f4a7
1 parent e07747b
commit 019f4a7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/parsl/dataflow/dflow.py b/parsl/dataflow/dflow.py
@@ -1409,8 +1409,12 @@ class DataFlowKernelLoader:
     def clear(cls) -> None:
         """Clear the active DataFlowKernel so that a new one can be loaded."""
         cls._dfk = None
+<<<<<<< HEAD
     self.cleanup()
 
+=======
+        self.cleanup()
+>>>>>>> c4f3087c (fix for 3104)
     @classmethod
     @typeguard.typechecked
     def load(cls, config: Optional[Config] = None) -> DataFlowKernel:
@@ -1448,4 +1452,8 @@ def dfk(cls) -> DataFlowKernel:
         if cls._dfk is None:
             raise NoDataFlowKernelError('Must first load config')
         return cls._dfk
+<<<<<<< HEAD
     self.cleanup()
+=======
+        self.cleanup()
+>>>>>>> c4f3087c (fix for 3104)