remove notes

f7512877 · zhuwenwen · 6d2051cc · f7512877
Commit f7512877 authored Oct 22, 2024 by zhuwenwen
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

vllm/model_executor/models/chatglm.py vllm/model_executor/models/chatglm.py +0 -1

No files found.
--- a/vllm/model_executor/models/chatglm.py
+++ b/vllm/model_executor/models/chatglm.py
@@ -222,7 +222,6 @@ def input_processor_for_glmv(ctx: InputContext, inputs: DecoderOnlyInputs):
    inputs["prompt_token_ids"] = new_input_ids
    inputs["position_ids"] = new_position_ids
    return inputs
->>>>>>> v0.6.3.post1


 class GLMAttention(nn.Module):