fix(changelog): Fix changelog (#3788)

iambriccardo · web-flow · commit 45a676d21156 · 2024-07-04T08:28:17.000Z
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**:
