From f3d82cf167a7c9003302b8e124da089ce1176b46 Mon Sep 17 00:00:00 2001 From: Rajesh Deshpande Date: Fri, 27 Mar 2020 12:25:05 +0530 Subject: [PATCH] Removing junk chars Removing junk chars --- content/en/docs/tasks/manage-daemon/update-daemon-set.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/en/docs/tasks/manage-daemon/update-daemon-set.md b/content/en/docs/tasks/manage-daemon/update-daemon-set.md index ccbce55313..e4640e3ccd 100644 --- a/content/en/docs/tasks/manage-daemon/update-daemon-set.md +++ b/content/en/docs/tasks/manage-daemon/update-daemon-set.md @@ -75,11 +75,7 @@ If you haven't created the DaemonSet in the system, check your DaemonSet manifest with the following command instead: ```shell -<<<<<<< HEAD kubectl apply -f https://k8s.io/examples/controllers/fluentd-daemonset.yaml --dry-run=client -o go-template='{{.spec.updateStrategy.type}}{{"\n"}}' -======= -kubectl apply -f https://k8s.io/examples/controllers/fluentd-daemonset.yaml --dry-run -o go-template='{{.spec.updateStrategy.type}}{{"\n"}}' ->>>>>>> Adding example for DaemonSet Rolling Update task ``` The output from both commands should be: