clean up

triton-inference-server · Jan 30, 2025 · 0c7c572 · 0c7c572
1 parent 84f6197
commit 0c7c572
Showing 1 changed file with 0 additions and 4 deletions.
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,