fix: Remove merge relics

605b25e6 · Christopher Kyle Galloway · 5abd94e8 · 605b25e6
Commit 605b25e6 authored 8 months ago by Christopher Kyle Galloway
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,10 +58,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [6.7.15-bb.4] - 2024-05-08

 ### Added
-<<<<<<< HEAD
-=======

->>>>>>> main
 - Added Istio Sidecar to restrict egress traffic to REGISTRY_ONLY
 - Added Istio ServiceEntry
 - Added istiohardened doc