clean up space

Signed-off-by: Xiao Yu <[email protected]>

Author: amd-xiaoyu12

vllm/envs.py

@@ -1183,8 +1183,12 @@ def get_vllm_port() -> Optional[int]:
     # If set, use the fp8 mfma in rocm paged attention.
     "VLLM_ROCM_FP8_MFMA_PAGE_ATTN":
     lambda: bool(int(os.getenv("VLLM_ROCM_FP8_MFMA_PAGE_ATTN", "0"))),
+<<<<<<< HEAD
 
 >>>>>>> c588bf50e (Update vllm/envs.py)
+=======
+
+>>>>>>> 0c785a544 (clean up space)
     # Whether to use pytorch symmetric memory for allreduce
     "VLLM_ALLREDUCE_USE_SYMM_MEM":
     lambda: bool(int(os.getenv("VLLM_ALLREDUCE_USE_SYMM_MEM", "0"))),