Fix after rebasing

Author: Slavek Kabrda

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java

@@ -29,14 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-<<<<<<< HEAD
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-=======
 import java.util.*;
->>>>>>> Fix defaults for enums
 
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 

modules/openapi-generator/src/main/resources/go-experimental/model.mustache

@@ -48,7 +48,10 @@ type {{classname}} struct {
 {{/vars}}
 {{/vendorExtensions.x-is-one-of-interface}}
 }
+{{/isEnum}}
 
+{{^isEnum}}
+{{^vendorExtensions.x-is-one-of-interface}}
 // New{{classname}} instantiates a new {{classname}} object
 // This constructor will assign default values to properties that have it defined,
 // and makes sure properties required by API are set, but the set of arguments
@@ -86,10 +89,7 @@ func New{{classname}}WithDefaults() *{{classname}} {
 {{/vars}}
     return &this
 }
-{{/isEnum}}
 
-{{^isEnum}}
-{{^vendorExtensions.x-is-one-of-interface}}
 {{#vars}}
 {{#required}}
 // Get{{name}} returns the {{name}} field value