Merge branch 'master' of http://khuhub.khu.ac.kr/2020-1-CloudComputing/D_Team_Khuloud

Hong
Commit 273b7fd2df91224e405752d99afb4601b249dc6d 273b7fd2 2 parents efdbda45 236af3a5
Showing 1 changed file with 18 additions and 16 deletions
backend/package-lock.json
--- a/backend/package-lock.json
View file @273b7fd
+++ b/backend/package-lock.json
View file @273b7fd
@@ -113,22 +113,6 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
-    "aws-sdk": {
-      "version": "2.683.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.683.0.tgz",
-      "integrity": "sha512-mi1175pJMbQhCWhBEQ5ccQ3SDE+SJzbapuAQtcb7tdLLV7dPKf4zQXhpqK1uG0dysm8NhsNtgxwA2diYOKWlTg==",
-      "requires": {
-        "buffer": "4.9.1",
-        "events": "1.1.1",
-        "ieee754": "1.1.13",
-        "jmespath": "0.15.0",
-        "querystring": "0.2.0",
-        "sax": "1.2.1",
-        "url": "0.10.3",
-        "uuid": "3.3.2",
-        "xml2js": "0.4.19"
-      }
-    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -1117,9 +1101,15 @@
       "integrity": "sha512-GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="
     },
     "punycode": {
+<<<<<<< HEAD
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+=======
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
     },
     "qs": {
       "version": "6.5.2",
@@ -1337,6 +1327,8 @@
       "requires": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
+<<<<<<< HEAD
+=======
       },
       "dependencies": {
         "punycode": {
@@ -1344,6 +1336,7 @@
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
           "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
+>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
       }
     },
     "tunnel-agent": {
@@ -1410,6 +1403,8 @@
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "requires": {
         "punycode": "^2.1.0"
+<<<<<<< HEAD
+=======
       },
       "dependencies": {
         "punycode": {
@@ -1426,6 +1421,7 @@
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"
+>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
       }
     },
     "util-deprecate": {
@@ -1439,9 +1435,15 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
+<<<<<<< HEAD
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+=======
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+>>>>>>> 677e924ea1f8968d4b256c5c0ca83390eb370802
     },
     "vary": {
       "version": "1.1.2",