From dc70357a84fa15358b4d5b2f04768d630bf134c9 Mon Sep 17 00:00:00 2001 From: June Yi Date: Sun, 14 Oct 2018 20:58:41 +0900 Subject: [PATCH] Fix build failure by adding example and include files (#10610) Signed-off-by: June Yi --- content/zh/docs/reference/tools.md.rej | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 content/zh/docs/reference/tools.md.rej diff --git a/content/zh/docs/reference/tools.md.rej b/content/zh/docs/reference/tools.md.rej new file mode 100644 index 0000000000000..ddf1cbd3764ca --- /dev/null +++ b/content/zh/docs/reference/tools.md.rej @@ -0,0 +1,19 @@ +diff a/content/zh/docs/reference/tools.md b/content/zh/docs/reference/tools.md (rejected hunks) +@@ -14,9 +14,7 @@ content_template: templates/concept + --- + + + {{% capture overview %}} + Kubernetes 包含一些内置工具,可以帮助用户更好的使用 Kubernetes 系统。 +@@ -102,7 +100,6 @@ Use Kompose to: + * Translate a Docker Compose file into Kubernetes objects + * Go from local Docker development to managing your application via Kubernetes + * Convert v1 or v2 Docker Compose `yaml` files or [Distributed Application Bundles](https://docs.docker.com/compose/bundles/) +-{{% /capture %}} + --> + 使用 Kompose: +