Fix rebase artifacts

Signed-off-by: Paschalis Tsilias <[email protected]>
grafana · Aug 1, 2024 · 247b167 · 247b167
1 parent fdcf676
commit 247b167
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,8 +62,6 @@ Main (unreleased)
 
 - `mimir.rules.kubernetes` is now able to add extra labels to the Prometheus rules. (@psychomantys)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 - Upgrade from OpenTelemetry v0.102.1 to v0.105.0.
   - [`otelcol.receiver.*`] A new `compression_algorithms` attribute to configure which 
     compression algorithms are allowed by the HTTP server.