From 10de193b80bd112654833a5b37baf3631a5af20b Mon Sep 17 00:00:00 2001 From: WuHaobo Date: Mon, 13 Apr 2020 21:12:35 +0800 Subject: [PATCH] resolve conflict --- docs/en/extension/index.rst | 12 ------------ .../image_augmentation/ImageAugment.md | 0 .../advanced_tutorials/image_augmentation/index.rst | 0 docs/{zh_cn => zh_CN}/advanced_tutorials/index.rst | 0 docs/{zh_cn => zh_CN}/competition_support.md | 0 5 files changed, 12 deletions(-) delete mode 100644 docs/en/extension/index.rst rename docs/{zh_cn => zh_CN}/advanced_tutorials/image_augmentation/ImageAugment.md (100%) rename docs/{zh_cn => zh_CN}/advanced_tutorials/image_augmentation/index.rst (100%) rename docs/{zh_cn => zh_CN}/advanced_tutorials/index.rst (100%) rename docs/{zh_cn => zh_CN}/competition_support.md (100%) diff --git a/docs/en/extension/index.rst b/docs/en/extension/index.rst deleted file mode 100644 index cc17c18a..00000000 --- a/docs/en/extension/index.rst +++ /dev/null @@ -1,12 +0,0 @@ -extension -================================ - -.. toctree:: - :maxdepth: 1 - - paddle_inference.md - paddle_mobile_inference.md - paddle_quantization.md - multi_machine_training.md - paddle_hub.md - paddle_serving.md diff --git a/docs/zh_cn/advanced_tutorials/image_augmentation/ImageAugment.md b/docs/zh_CN/advanced_tutorials/image_augmentation/ImageAugment.md similarity index 100% rename from docs/zh_cn/advanced_tutorials/image_augmentation/ImageAugment.md rename to docs/zh_CN/advanced_tutorials/image_augmentation/ImageAugment.md diff --git a/docs/zh_cn/advanced_tutorials/image_augmentation/index.rst b/docs/zh_CN/advanced_tutorials/image_augmentation/index.rst similarity index 100% rename from docs/zh_cn/advanced_tutorials/image_augmentation/index.rst rename to docs/zh_CN/advanced_tutorials/image_augmentation/index.rst diff --git a/docs/zh_cn/advanced_tutorials/index.rst b/docs/zh_CN/advanced_tutorials/index.rst similarity index 100% rename from docs/zh_cn/advanced_tutorials/index.rst rename to docs/zh_CN/advanced_tutorials/index.rst diff --git a/docs/zh_cn/competition_support.md b/docs/zh_CN/competition_support.md similarity index 100% rename from docs/zh_cn/competition_support.md rename to docs/zh_CN/competition_support.md -- GitLab