From b29373c0c465b59389adb36506275e7de16c8feb Mon Sep 17 00:00:00 2001
From: hdpuk86 <hayley.d.prior@gmail.com>
Date: Thu, 24 Oct 2019 21:53:48 +0100
Subject: [PATCH] update swagger-ui to 3.23.11

---
 rswag-ui/package-lock.json | 6 ------
 rswag-ui/package.json      | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/rswag-ui/package-lock.json b/rswag-ui/package-lock.json
index f1458f1..8bc72e8 100644
--- a/rswag-ui/package-lock.json
+++ b/rswag-ui/package-lock.json
@@ -5,15 +5,9 @@
   "requires": true,
   "dependencies": {
     "swagger-ui-dist": {
-<<<<<<< HEAD
       "version": "3.23.11",
       "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.23.11.tgz",
       "integrity": "sha512-ipENHHH/sqpngTpHXUwg55eAOZ7b2UVayUwwuWPA6nQSPhjBVXX4zOPpNKUwQIFOl3oIwVvZF7mqoxH7pMgVzA=="
-=======
-      "version": "3.18.2",
-      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.18.2.tgz",
-      "integrity": "sha512-pWAEiKkgWUJvjmLW9AojudnutJ+NTn5g6OdNLj1iIJWwCkoy40K3Upwa24DqFbmIE4vLX4XplND61hp2L+s5vg=="
->>>>>>> origin/master
     }
   }
 }
diff --git a/rswag-ui/package.json b/rswag-ui/package.json
index 9f600c5..fd299d1 100644
--- a/rswag-ui/package.json
+++ b/rswag-ui/package.json
@@ -3,10 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-<<<<<<< HEAD
     "swagger-ui-dist": "3.23.11"
-=======
-    "swagger-ui-dist": "3.18.2"
->>>>>>> origin/master
   }
 }