376112-content-pattern-metadata-updates-app-service

Author: LHL407

articles/app-service/includes/configure-language-java/java-variants.md

@@ -7,12 +7,6 @@ ms.date: 03/27/2025
 
 Azure App Service runs Java web applications on a fully managed service in three variants:
 
-<<<<<<< HEAD
-* Java SE - Can run an app deployed as a JAR package that contains an embedded server (such as Spring Boot, Dropwizard, Quarkus, or an app with an embedded Tomcat or Jetty server).
-* Tomcat - The built-in Tomcat server can run an app deployed as a WAR package.
-* JBoss EAP - Supported for Linux apps in the Free, Premium v3, and Isolated v2 pricing tiers only. The built-in JBoss EAP server can run an app deployed as a WAR or EAR package.
-=======
-* Java Standard Edition (SE) - Can run an app deployed as a Java Archive (JAR) package that contains an embedded server (such as Spring Boot, Quarkus, Dropwizard, or one with an embedded Tomcat or Jetty server).   
-* Tomcat - The built-in Tomcat server can run an app deployed as a Web application ARchive (WAR) package.
-* JBoss Enterprise Application Platform (EAP) - The built-in JBoss EAP server can run an app deployed as a WAR or Enterprise Archive (EAR) package. Supported for Linux apps in a set of pricing tiers which includes Free, Premium v3, and Isolated v2.
->>>>>>> b67f1b5cf1ae674e0f9e4f57e2f02239e35e4c8a
+* Java Standard Edition (SE) - Can run an app deployed as a Java Archive (JAR) package that contains an embedded server (such as Spring Boot, Quarkus, Dropwizard, or an app with an embedded Tomcat or Jetty server).
+* Tomcat - The built-in Tomcat server can run an app deployed as a web application archive (WAR) package.
+* JBoss Enterprise Application Platform (EAP) - The built-in JBoss EAP server can run an app deployed as a WAR or enterprise archive (EAR) package. Supported for Linux apps in a set of pricing tiers which includes Free, Premium v3, and Isolated v2.