From 83b213357397b7f643517d899d934c8ce1668fcc Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 23 Aug 2018 04:56:22 -0500
Subject: [PATCH] Oops, fixing bad conflict resolve

---
 slides/kube-halfday.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml
index 9df37a3c..be3a12a5 100644
--- a/slides/kube-halfday.yml
+++ b/slides/kube-halfday.yml
@@ -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