Apply suggestions from code review

szabosteve · Jan 21, 2025 · 8be0601 · 8be0601
1 parent 46f1a87
commit 8be0601
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/reference/inference/put-inference.asciidoc b/docs/reference/inference/put-inference.asciidoc
@@ -42,11 +42,7 @@ include::inference-shared.asciidoc[tag=inference-id]
 include::inference-shared.asciidoc[tag=task-type]
 +
 --
-<<<<<<< HEAD
 Refer to the service list in the <<put-inference-api-desc,API description section>> for the available task types. 
-=======
-Refer to the integration list in the <<put-inference-api-desc,API description section>> for the available task types.
->>>>>>> c60b3be6c72 ([DOCS] Rename inference services to inference integrations in docs (#120212))
 --