translate "result after merge"

2020-10-27 13:09:13 +08:00
parent baf9e185dd
commit f5f7393ddb
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