fix(changelog): Fix changelog (#3788)

getsentry · Jul 4, 2024 · 45a676d · 45a676d
1 parent 6abe6f7
commit 45a676d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,8 +18,6 @@
 - Extract thread ID and name in spans. ([#3771](https://github.com/getsentry/relay/pull/3771))
 - Compute metrics summary on the extracted custom metrics. ([#3769](https://github.com/getsentry/relay/pull/3769))
 
->>>>>>> master
-
 ## 24.6.0
 
 **Bug fixes**: