From f5f7393ddbba588d3adf1ea3812da08753447d6f Mon Sep 17 00:00:00 2001 From: xieyanker Date: Tue, 27 Oct 2020 13:09:13 +0800 Subject: [PATCH] translate "result after merge" --- .../docs/tasks/manage-kubernetes-objects/declarative-config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/docs/tasks/manage-kubernetes-objects/declarative-config.md b/content/zh/docs/tasks/manage-kubernetes-objects/declarative-config.md index 75bc47770e..3ed8d41713 100644 --- a/content/zh/docs/tasks/manage-kubernetes-objects/declarative-config.md +++ b/content/zh/docs/tasks/manage-kubernetes-objects/declarative-config.md @@ -1069,7 +1069,7 @@ Kubernetes 源代码中为每个字段定义了 `patchMergeKey`： - name: nginx-helper-d # 键 nginx-helper-d 会被保留 image: helper:1.3 -# result after merge +# 合并结果 containers: - name: nginx image: nginx:1.16