Merge pull request #24738 from xieyanker/patch-2

translate "result after merge"
2020-10-27 02:01:59 -07:00
parent e1d6a3a69a f5f7393ddb
commit aea6b52fdc
1 changed files with 1 additions and 1 deletions
@@ -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