From f3a094f32f528f20e2b77c3a9eda71171e5c06fc Mon Sep 17 00:00:00 2001
From: Alanna Burke <alanna.burke@amazee.com>
Date: Mon, 11 Sep 2023 18:53:15 -0400
Subject: [PATCH] Quick merge fix for logging page.

---
 docs/logging/logging.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/logging/logging.md b/docs/logging/logging.md
index efa90cb9dd..0377d071fa 100644
--- a/docs/logging/logging.md
+++ b/docs/logging/logging.md
@@ -2,11 +2,7 @@
 
 Lagoon provides access to the following logs via Kibana:
 
-<<<<<<< HEAD
-1. Logs from the Kubernetes Routers, including every single HTTP and HTTPS request with:
-=======
 * Logs from the Kubernetes Routers, including every single HTTP and HTTPS request with:
->>>>>>> c5708ed6d405ed33273a925012b66d0fe1156036
   * Source IP
   * URL
   * Path