fix

Signed-off-by: Amog Kamsetty <amogkamsetty@gmail.com>

Author: amogkam

vllm/v1/outputs.py

@@ -111,15 +111,11 @@ class ModelRunnerOutput:
     # [prompt_len]
     prompt_logprobs_dict: dict[str, Optional[LogprobsTensors]]
 
-<<<<<<< HEAD
     # num_reqs x num_generated_tokens x num_additional_head_outputs
     additional_head_outputs: Optional[AdditionalHeadOutputs] = None
-
-=======
     # [req_ids]
     finished_sending: Optional[set[str]] = None
     finished_recving: Optional[set[str]] = None
->>>>>>> b6553be1bc75f046b00046a4ad7576364d03c835
 
 
 EMPTY_MODEL_RUNNER_OUTPUT = ModelRunnerOutput(req_ids=[],