kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing junk chars 

Removing junk chars
This commit is contained in:
Rajesh Deshpande 2020-03-27 12:25:05 +05:30 committed by GitHub
parent dfb8d40026
commit f3d82cf167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/en/docs/tasks/manage-daemon/update-daemon-set.md
View File

@ -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: