chore: cherry pick of #2805

pytorch · May 17, 2024 · 014ab40 · 014ab40
1 parent db24b3b
commit 014ab40
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docsrc/index.rst b/docsrc/index.rst
@@ -111,13 +111,10 @@ Tutorials
    tutorials/_rendered_examples/dynamo/torch_compile_transformers_example
    tutorials/_rendered_examples/dynamo/torch_compile_advanced_usage
    tutorials/_rendered_examples/dynamo/torch_compile_stable_diffusion
-<<<<<<< HEAD
    tutorials/_rendered_examples/dynamo/custom_kernel_plugins
-=======
    tutorials/_rendered_examples/distributed_inference/data_parallel_gpt2
    tutorials/_rendered_examples/distributed_inference/data_parallel_stable_diffusion
 
->>>>>>> dfbf6ea84 (feat: data parallel inference sample)
 
 Python API Documenation
 ------------------------