Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Oleastre fix check for file type #570

Merged
merged 3 commits into from
Dec 27, 2019
Merged

Conversation

HugoMario
Copy link
Contributor

fixed #373 conflicts.

oleastre and others added 3 commits May 3, 2019 10:56
Automated replacement with the following sed command:
sed -i -re "s/\\{\\{([/#^](is|not))File\\}\\}/{{\1Binary}}/g" $FILENAME
…/swagger-codegen-generators into oleastre-fix-check-for-file-type

# Conflicts:
#	src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
#	src/main/resources/handlebars/JavaInflector/formParams.mustache
#	src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/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-server/api_doc.mustache
@HugoMario HugoMario merged commit d71093d into master Dec 27, 2019
@HugoMario HugoMario deleted the oleastre-fix-check-for-file-type branch December 27, 2019 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants