Skip to content
GitLab

[kotlin] Fixing merge conflict and re-running CI for #4565

Merged Jim Schubert requested to merge github/fork/jimschubert/nekkiy-fix-kotlinArrayEnumEmbedded into master

This is local fixes for the merge conflict in #4565. Once CI passes, we can merge.

From original PR:

This PR contains commits from #4544 Related bug #4368 (closed)

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.