Fix conflicts.

BalaBalaYi · Jan 2, 2024 · 7094d6a · 7094d6a
2 parents 28d78c9 + fcab049
commit 7094d6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -203,7 +203,11 @@ Please refer to the [DEVELOPMENT](docs/developer_guide.md)
 
 ## Quick Start
 
+<<<<<<< HEAD
 [Train a PyTorch Model on Kubernetes.](docs/tutorial/torch_elasticjob_on_k8s.md)
+=======
+[Train a PyTorch Model on Kubernetes.](docs/tutorial/torch_on_cloud.md)
+>>>>>>> master
 
 [Train a GPT Model on Kubernetes.](docs/tutorial/torch_ddp_nanogpt.md)
 

diff --git a/docs/figures/dlrover-goodput-performance.jpg b/docs/figures/dlrover-goodput-performance.jpg