github/container.training
1
0
Fork 0
mirror of https://github.com/jpetazzo/container.training.git synced 2026-07-22 14:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops, fixing bad conflict resolve

Browse Source
This commit is contained in:
Jerome Petazzoni
2018-08-23 04:56:22 -05:00
committed by Jérôme Petazzoni
parent a80c095a07
commit 28174b6cf9
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slides/kube-halfday.yml
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