Merge branch 'roc-6.3.x' into docs/6.3.3

2026-04-05 03:01:17 -04:00 · 2025-02-19 17:22:38 -05:00
parent 275ef1d511 cd79403931
commit e071738908
1 changed files with 0 additions and 2 deletions
--- a/docs/how-to/rocm-for-ai/inference/vllm-benchmark.rst
+++ b/docs/how-to/rocm-for-ai/inference/vllm-benchmark.rst
@@ -444,8 +444,6 @@ Further reading
 - To learn how to optimize inference on LLMs, see
  :doc:`Inference optimization <../inference-optimization/index>`.

-<<<<<<< HEAD:docs/how-to/performance-validation/mi300x/vllm-benchmark.rst
-=======
 - To learn how to fine-tune LLMs, see
  :doc:`Fine-tuning LLMs <../fine-tuning/index>`.