Remove unmerged code

coreyjadams · May 28, 2024 · 72fe093 · 72fe093
1 parent 3a96e73
commit 72fe093
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/jax/_src/clusters/cluster.py b/jax/_src/clusters/cluster.py
@@ -44,11 +44,8 @@ def auto_detect_unset_distributed_params(cls,
                                            num_processes: int | None,
                                            process_id: int | None,
                                            local_device_ids: Sequence[int] | None,
-<<<<<<< HEAD
                                            spec_detection_method: str | None,
-=======
                                            initialization_timeout: int | None,
->>>>>>> 06cd05d1d6722e77744556983e99396d0c208774
                                           ) -> tuple[str | None, int | None, int | None,
                                                      Sequence[int] | None]: