From 23f08fe84dfd00633d6dc922037e125c38db8960 Mon Sep 17 00:00:00 2001
From: Jonathan Bailey <jonathan_bailey@bose.com>
Date: Mon, 16 Dec 2019 13:16:11 -0500
Subject: [PATCH] Resolve merge conflicts

---
 src/services/models/Operation.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/models/Operation.ts b/src/services/models/Operation.ts
index aacd4749..681bf8af 100644
--- a/src/services/models/Operation.ts
+++ b/src/services/models/Operation.ts
@@ -122,6 +122,7 @@ export class OperationModel implements IMenuItem {
       this.security = (operationSpec.security || parser.spec.security || []).map(
         security => new SecurityRequirementModel(security, parser),
       );
+    }
 
     const requestBodyContent = this.requestBody && this.requestBody.content;
     if (requestBodyContent && requestBodyContent.hasSample) {