Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Lion7 fix check for file type #569

Merged
merged 5 commits into from
Dec 26, 2019
Merged

Conversation

HugoMario
Copy link
Contributor

fixed conflict for #185 before merging it

lion7 and others added 5 commits September 26, 2018 14:13
…agger-codegen-generators into lion7-fix-check-for-file-type

# Conflicts:
#	src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
#	src/main/resources/handlebars/Java/api_doc.mustache
#	src/main/resources/handlebars/JavaJaxRS/api.mustache
#	src/main/resources/handlebars/JavaJaxRS/cxf-cdi/api.mustache
#	src/main/resources/handlebars/JavaJaxRS/cxf/api_test.mustache
#	src/main/resources/handlebars/JavaJaxRS/di/api.mustache
#	src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/api.mustache
#	src/main/resources/handlebars/JavaSpring/api.mustache
#	src/main/resources/handlebars/JavaSpring/apiDelegate.mustache
#	src/main/resources/handlebars/JavaSpring/formParams.mustache
#	src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/formParams.mustache
#	src/main/resources/handlebars/kotlin-client/api_doc.mustache
#	src/main/resources/handlebars/kotlin-server/api_doc.mustache
#	src/main/resources/handlebars/php/api.mustache
#	src/main/resources/handlebars/php/api_doc.mustache
@HugoMario HugoMario merged commit 90b7e48 into master Dec 26, 2019
@HugoMario HugoMario deleted the lion7-fix-check-for-file-type branch December 26, 2019 21:51
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants