Oops, fixing bad conflict resolve

This commit is contained in:
Jerome Petazzoni
2018-08-23 04:56:22 -05:00
parent 7d7cb0eadb
commit 83b2133573

View File

@@ -42,7 +42,6 @@ chapters:
- k8s/rollout.md
- - k8s/logs-cli.md
# Bridget hasn't added EFK yet
<<<<<<< HEAD
#- k8s/logs-centralized.md
- k8s/helm.md
- k8s/namespaces.md