fix conflicts

adap · Nov 24, 2023 · 45105f5 · 45105f5
1 parent d0cc1f1
commit 45105f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/py/flwr/client/middleware/typing.py b/src/py/flwr/client/middleware/typing.py
@@ -16,7 +16,7 @@
 
 from typing import Callable
 
-from flwr.client.typing import Bwd, Fwd
+from flwr.client.flower import Bwd, Fwd
 
 App = Callable[[Fwd], Bwd]
 Layer = Callable[[Fwd, App], Bwd]
diff --git a/src/py/flwr/client/middleware/utils.py b/src/py/flwr/client/middleware/utils.py
@@ -16,7 +16,7 @@
 
 from typing import List
 
-from flwr.client.typing import Bwd, Fwd
+from flwr.client.flower import Bwd, Fwd
 
 from .typing import App, Layer
 

diff --git a/src/py/flwr/client/middleware/utils_test.py b/src/py/flwr/client/middleware/utils_test.py
@@ -18,7 +18,7 @@
 import unittest
 from typing import List
 
-from flwr.client.typing import Bwd, Fwd
+from flwr.client.flower import Bwd, Fwd
 from flwr.client.workload_state import WorkloadState
 from flwr.proto.task_pb2 import TaskIns, TaskRes