Resolve conflicts for #4760 (#4762)

a911b856 · Yuge Zhang · GitHub · 14d2966b · a911b856 · a911b856
Unverified Commit a911b856 authored Apr 21, 2022 by Yuge Zhang Committed by GitHub Apr 21, 2022
20 changed files
--- a/docs/source/Tutorial/InstallationWin_zh.rst
+++ b/docs/source/Tutorial/InstallationWin_zh.rst
--- a/docs/source/Release_v1.0.md
+++ b/docs/source/Release_v1.0.md
--- a/docs/source/SupportedFramework_Library.rst
+++ b/docs/source/SupportedFramework_Library.rst
--- a/docs/source/TrainingService/AMLMode.rst
+++ b/docs/source/TrainingService/AMLMode.rst
--- a/docs/source/TrainingService/FrameworkControllerMode.rst
+++ b/docs/source/TrainingService/FrameworkControllerMode.rst
--- a/docs/source/TrainingService/HybridMode.rst
+++ b/docs/source/TrainingService/HybridMode.rst
--- a/docs/source/TrainingService/KubeflowMode.rst
+++ b/docs/source/TrainingService/KubeflowMode.rst
--- a/docs/source/TrainingService/Overview.rst
+++ b/docs/source/TrainingService/Overview.rst
--- a/docs/source/TrainingService/PaiMode.rst
+++ b/docs/source/TrainingService/PaiMode.rst
--- a/docs/source/TrainingService/RemoteMachineMode.rst
+++ b/docs/source/TrainingService/RemoteMachineMode.rst
--- a/docs/source/TrialExample/Cifar10Examples.rst
+++ b/docs/source/TrialExample/Cifar10Examples.rst
--- a/docs/source/TrialExample/GbdtExample.rst
+++ b/docs/source/TrialExample/GbdtExample.rst
--- a/docs/source/TrialExample/MnistExamples.rst
+++ b/docs/source/TrialExample/MnistExamples.rst
--- a/docs/source/TrialExample/Pix2pixExample.rst
+++ b/docs/source/TrialExample/Pix2pixExample.rst
--- a/docs/source/TrialExample/SklearnExamples.rst
+++ b/docs/source/TrialExample/SklearnExamples.rst
--- a/docs/source/TrialExample/Trials.rst
+++ b/docs/source/TrialExample/Trials.rst
--- a/docs/source/Tuner/BohbAdvisor.rst
+++ b/docs/source/Tuner/BohbAdvisor.rst
--- a/docs/source/Tuner/CustomizeAdvisor.rst
+++ b/docs/source/Tuner/CustomizeAdvisor.rst
--- a/docs/source/Tuner/DngoTuner.rst
+++ b/docs/source/Tuner/DngoTuner.rst
--- a/docs/source/Tuner/EvolutionTuner.rst
+++ b/docs/source/Tuner/EvolutionTuner.rst