Skip to content

Commit 014ab40

Browse files
committed
chore: cherry pick of #2805
1 parent db24b3b commit 014ab40

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

docsrc/index.rst

-3
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,10 @@ Tutorials
111111
tutorials/_rendered_examples/dynamo/torch_compile_transformers_example
112112
tutorials/_rendered_examples/dynamo/torch_compile_advanced_usage
113113
tutorials/_rendered_examples/dynamo/torch_compile_stable_diffusion
114-
<<<<<<< HEAD
115114
tutorials/_rendered_examples/dynamo/custom_kernel_plugins
116-
=======
117115
tutorials/_rendered_examples/distributed_inference/data_parallel_gpt2
118116
tutorials/_rendered_examples/distributed_inference/data_parallel_stable_diffusion
119117

120-
>>>>>>> dfbf6ea84 (feat: data parallel inference sample)
121118

122119
Python API Documenation
123120
------------------------

0 commit comments

Comments
 (0)