test pull

JinsooKim-KR · Oct 1, 2023 · d2118e0 · d2118e0
1 parent 8d0f6e8
commit d2118e0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/datasets/README.md b/datasets/README.md
@@ -1,6 +1,4 @@
 # Flower Datasets
-<<<<<<< HEAD
-=======
 
 [![GitHub license](https://img.shields.io/github/license/adap/flower)](https://github.com/adap/flower/blob/main/LICENSE)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/adap/flower/blob/main/CONTRIBUTING.md)
@@ -90,4 +88,3 @@ Here are a few of the things that we will work on in future releases:
 * Simplification of the dataset transformation to the popular frameworks/types.
 * Creation of the synthetic data,
 * Support for Vertical FL.
->>>>>>> ab7f77584b7caf37e98752016249b0cbfc6abd79
diff --git a/datasets/pyproject.toml b/datasets/pyproject.toml
@@ -54,13 +54,10 @@ exclude = [
 [tool.poetry.dependencies]
 python = "^3.8"
 numpy = "^1.21.0"
-<<<<<<< HEAD
-=======
 datasets = "^2.14.3"
 pillow = { version = ">=6.2.1", optional = true }
 soundfile = {version = ">=0.12.1", optional = true}
 librosa = { version = ">=0.10.0.post2", optional = true }
->>>>>>> ab7f77584b7caf37e98752016249b0cbfc6abd79
 
 [tool.poetry.dev-dependencies]
 isort = "==5.11.5"

diff --git a/src/py/flwr/simulation/ray_transport/ray_client_proxy.py b/src/py/flwr/simulation/ray_transport/ray_client_proxy.py
@@ -17,11 +17,7 @@
 
 import traceback
 from logging import ERROR
-<<<<<<< HEAD
 from typing import Callable, Dict, Optional, Union, cast
-=======
-from typing import Dict, Optional, cast
->>>>>>> ab7f77584b7caf37e98752016249b0cbfc6abd79
 
 import ray
 
@@ -40,13 +36,10 @@
     JobFn,
     VirtualClientEngineActorPool,
 )
-<<<<<<< HEAD
 ClientFn = Callable[[str], ClientLike]
 ClientRes = Union[
     common.GetPropertiesRes, common.GetParametersRes, common.FitRes, common.EvaluateRes
 ]
-=======
->>>>>>> ab7f77584b7caf37e98752016249b0cbfc6abd79
 
 
 class RayClientProxy(ClientProxy):