From 8ae0b72e59e6671cf42fa6da3de5a7eaceb86173 Mon Sep 17 00:00:00 2001 From: bassaer Date: Wed, 18 Nov 2020 01:44:42 +0900 Subject: [PATCH] remove conflict marker --- content/ja/docs/reference/kubectl/cheatsheet.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/ja/docs/reference/kubectl/cheatsheet.md b/content/ja/docs/reference/kubectl/cheatsheet.md index 47a9c157c9..caf2fc783c 100644 --- a/content/ja/docs/reference/kubectl/cheatsheet.md +++ b/content/ja/docs/reference/kubectl/cheatsheet.md @@ -214,10 +214,6 @@ kubectl get pods -o json | jq -c 'path(..)|[.[]|tostring]|join(".")' ## リソースのアップデート -<<<<<<< HEAD -======= - ->>>>>>> 8d357bf1e (finished translating cheartsheet.md) ```bash kubectl set image deployment/frontend www=image:v2 # frontend Deploymentのwwwコンテナイメージをv2にローリングアップデートします kubectl rollout history deployment/frontend # frontend Deploymentの改訂履歴を確認します