update envs.py

vllm/envs.py

@@ -175,12 +175,8 @@ if TYPE_CHECKING:
     USE_FUSED_SILU_MUL_QUANT: bool = False
     VLLM_P2P_ASYNC: bool = False
     VLLM_P2P_BUF_TOKENS: int = 30000
-<<<<<<< HEAD
-    VLLM_ENABLE_OUTPUT_PLACEHOLDERS: bool = False
-    VLLM_USE_PD_SPLIT: bool = False
-=======
     VLLM_SCHED_ENABLE_MINIMAL_INJECTION: bool = False
->>>>>>> 78d3e006e7ce4f2444e42720d1e1485186312ae3
+    VLLM_USE_PD_SPLIT: bool = False
 
 def get_default_cache_root():
     return os.getenv(