couple more

Author: alyx-db

sdks/java-v1/templates/libraries/jersey3/ApiClient.mustache

@@ -1359,11 +1359,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
       if ("".equals(entity.getEntity())) {
         response = invocationBuilder.method("DELETE");
       } else {
-<<<<<<< HEAD
-        response = invocationBuilder.method("DELETE", entity);
-=======
       response = invocationBuilder.method("DELETE", entity);
->>>>>>> java-v1-openapi-generator-upgrade-2
       }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);

sdks/java-v1/templates/libraries/jersey3/oneof_model.mustache

@@ -280,15 +280,9 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
      * @return The actual instance of `{{{dataType}}}`
      * @throws ClassCastException if the instance is not `{{{dataType}}}`
      */
-<<<<<<< HEAD
-    public {{{dataType}}} get{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}() throws ClassCastException {
-        return ({{{dataType}}})super.getActualInstance();
-    }
-=======
         public {{{dataType}}} get{{#sanitizeGeneric}}{{{dataType}}}{{/sanitizeGeneric}}() throws ClassCastException {
         return ({{{dataType}}})super.getActualInstance();
         }
->>>>>>> java-v1-openapi-generator-upgrade-2
 
     {{/vendorExtensions.x-duplicated-data-type-ignoring-erasure}}
     {{/oneOf}}

sdks/java-v1/templates/libraries/jersey3/pojo.mustache

@@ -82,11 +82,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   @Deprecated
   {{/deprecated}}
   {{>nullable_var_annotations}}
-<<<<<<< HEAD
-  private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
-=======
     private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
->>>>>>> java-v1-openapi-generator-upgrade-2
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
   {{/vars}}