docs: remove false deprecation note for standalone apm-server (#3752)

(cherry picked from commit 38f04c9) # Conflicts: # docs/en/apm-server/upgrading-to-8.x.asciidoc
elastic · Apr 15, 2024 · 6645a9e · 6645a9e
1 parent d3d88be
commit 6645a9e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/docs/en/apm-server/upgrading-to-8.x.asciidoc b/docs/en/apm-server/upgrading-to-8.x.asciidoc
@@ -29,8 +29,12 @@ See the APM <<release-notes,release notes>>, <<apm-breaking,breaking changes>> f
 Starting in version 7.14, there are two ways to run Elastic APM.
 Determine which method you're using, then use the links below to find the correct upgrading guide.
 
+<<<<<<< HEAD:docs/en/apm-server/upgrading-to-8.x.asciidoc
 * **Standalone (legacy)**: Users in this mode run and configure the APM Server binary.
 This mode has been deprecated and will be removed in a future release.
+=======
+* **Standalone**: Users in this mode run and configure the APM Server binary.
+>>>>>>> 38f04c90 (docs: remove false deprecation note for standalone apm-server (#3752)):docs/en/observability/apm/upgrading-to-8.x.asciidoc
 * **{fleet} and the APM integration**: Users in this mode run and configure {fleet} and the Elastic APM integration.
 
 **Self-installation (non-{ecloud} users) upgrade guides**