typescript-axios pr conflict tweak #1204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- (apiInner) made AxiosParamCreator and Factory interface arrow functions - (apiInner) Bug fix for @param with generic dataTypes - (modelGeneric) Fixed bug for multi-line jsdoc descriptions - (modelGeneric) Added support for examples in jsdocs - (modelGeneric) Now imports dependencies from #imports
…en-generators Merging with main swagger-codegen-generators repo
- (generator/typescript-axios) Added npmName, npmVersion, and npmRepository custom options support - (templates/typescript-axios) Minor style improvements - (docs) Fixed typos in README.md
…generators into DonIsaac-master # Conflicts: # src/main/resources/handlebars/typescript-axios/apiInner.mustache # src/main/resources/handlebars/typescript-axios/modelGeneric.mustache
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes conflicts for #960