Resolve merge conflicts

This commit is contained in:
Jonathan Bailey 2019-12-16 13:16:11 -05:00
parent 8ea6bb134e
commit 23f08fe84d

View File

@ -122,6 +122,7 @@ export class OperationModel implements IMenuItem {
this.security = (operationSpec.security || parser.spec.security || []).map( this.security = (operationSpec.security || parser.spec.security || []).map(
security => new SecurityRequirementModel(security, parser), security => new SecurityRequirementModel(security, parser),
); );
}
const requestBodyContent = this.requestBody && this.requestBody.content; const requestBodyContent = this.requestBody && this.requestBody.content;
if (requestBodyContent && requestBodyContent.hasSample) { if (requestBodyContent && requestBodyContent.hasSample) {