resolve conflict

10de193b · WuHaobo · 8b8659af · 8b8659af · 10de193b · 10de193b
5 changed file
--- a/docs/en/extension/index.rst
+++ b/docs/en/extension/index.rst
-extension
-================================
-.. toctree::
-   :maxdepth: 1
-   paddle_inference.md
-   paddle_mobile_inference.md
-   paddle_quantization.md
-   multi_machine_training.md
-   paddle_hub.md
-   paddle_serving.md
--- a/docs/zh_cn/advanced_tutorials/image_augmentation/ImageAugment.md
+++ b/docs/zh_cn/advanced_tutorials/image_augmentation/ImageAugment.md
--- a/docs/zh_cn/advanced_tutorials/image_augmentation/index.rst
+++ b/docs/zh_cn/advanced_tutorials/image_augmentation/index.rst
--- a/docs/zh_cn/advanced_tutorials/index.rst
+++ b/docs/zh_cn/advanced_tutorials/index.rst
--- a/docs/zh_cn/competition_support.md
+++ b/docs/zh_cn/competition_support.md