fix-changelog

elastic · Nov 27, 2019 · d83ebe4 · d83ebe4
1 parent 7e5adea
commit d83ebe4
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -11,5 +11,3 @@ https://github.com/elastic/apm-server/compare/7.5\...master[View commits]
 - Try to extract IP address from headers before using socket remote_address for `client.ip` and `source.ip` {pull}2935[2935].
 - Only use extracted hostname when valid IP for enriching events {pull}2935[2935].
 - Added experimental support for continuous profiling of the server {pull}2839[2839]
-
->>>>>>> beater: add profiling endpoint