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/compression/quantizer.rst
+++ b/docs/source/compression/quantizer.rst
--- a/docs/source/compression/toctree.rst
+++ b/docs/source/compression/toctree.rst
--- a/docs/source/compression/toctree_pruning.rst
+++ b/docs/source/compression/toctree_pruning.rst
--- a/docs/source/compression/toctree_quantization.rst
+++ b/docs/source/compression/toctree_quantization.rst
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
--- a/docs/source/contribution.rst
+++ b/docs/source/contribution.rst
--- a/docs/source/contribution_zh.rst
+++ b/docs/source/contribution_zh.rst
--- a/docs/source/examples.rst
+++ b/docs/source/examples.rst
--- a/docs/source/examples_zh.rst
+++ b/docs/source/examples_zh.rst
--- a/docs/source/experiment/experiment_management.rst
+++ b/docs/source/experiment/experiment_management.rst
--- a/docs/source/experiment/overview.rst
+++ b/docs/source/experiment/overview.rst
--- a/docs/source/experiment/toctree.rst
+++ b/docs/source/experiment/toctree.rst
--- a/docs/source/TrainingService/AdaptDLMode.rst
+++ b/docs/source/TrainingService/AdaptDLMode.rst
--- a/docs/source/experiment/training_service/aml.rst
+++ b/docs/source/experiment/training_service/aml.rst
--- a/docs/source/TrainingService/HowToImplementTrainingService.rst
+++ b/docs/source/TrainingService/HowToImplementTrainingService.rst
--- a/docs/source/experiment/training_service/frameworkcontroller.rst
+++ b/docs/source/experiment/training_service/frameworkcontroller.rst
--- a/docs/source/experiment/training_service/hybrid.rst
+++ b/docs/source/experiment/training_service/hybrid.rst
--- a/docs/source/experiment/training_service/kubeflow.rst
+++ b/docs/source/experiment/training_service/kubeflow.rst
--- a/docs/source/experiment/training_service/local.rst
+++ b/docs/source/experiment/training_service/local.rst
--- a/docs/source/experiment/training_service/openpai.rst
+++ b/docs/source/experiment/training_service/openpai.rst