Merge pull request #3544 from uselagoon/merge-fix

Quick merge fix for logging page.
uselagoon · Sep 11, 2023 · d4f0537 · d4f0537
2 parents afc5996 + f3a094f
commit d4f0537
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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