From 019f4a7c34f97a44dbbe5e4826c919d9b6724660 Mon Sep 17 00:00:00 2001
From: Nupur Kale <nupur78042@gmail.com>
Date: Tue, 5 Mar 2024 19:33:48 +0530
Subject: [PATCH] fix for 3104

---
 parsl/dataflow/dflow.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/parsl/dataflow/dflow.py b/parsl/dataflow/dflow.py
index eaab8433f4..6ed261523c 100644
--- 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)