clean up

ziqifan617 · ziqifan617 · commit 0c7c572a9373 · 2025-01-30T13:02:29.000-08:00
diff --git a/src/request_executor.cc b/src/request_executor.cc
@@ -199,11 +199,7 @@ InferResponseComplete(
       }
       pb_error = std::make_shared<PbError>(pb_exception.what());
     }
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> 408c23b (feat: Extend response parameters support to BLS in python backend)
     if (!infer_payload->IsDecoupled()) {
       infer_response = std::make_unique<InferResponse>(
           output_tensors, pb_error, parameters_string,

Original file line number	Diff line number	Diff line change
`@@ -199,11 +199,7 @@ InferResponseComplete(`
`199`	`199`	`}`
`200`	`200`	`pb_error = std::make_shared<PbError>(pb_exception.what());`
`201`	`201`	`}`
`202`		`-<<<<<<< HEAD`
`203`		`-`
`204`		`-=======`
`205`	`202`
`206`		`->>>>>>> 408c23b (feat: Extend response parameters support to BLS in python backend)`
`207`	`203`	`if (!infer_payload->IsDecoupled()) {`
`208`	`204`	`infer_response = std::make_unique<InferResponse>(`
`209`	`205`	`output_tensors, pb_error, parameters_string,`