커밋시 충돌부분 수정

fix: package-lock.json, index.js pull 과정 중 발생한 충돌 일부 수정

@@ -1151,17 +1151,15 @@
       "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
       "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
       "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
       "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
     },
     },
-<<<<<<< HEAD
     "isstream": {
     "isstream": {
       "version": "0.1.2",
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-=======
+    },
     "isarray": {
     "isarray": {
       "version": "1.0.0",
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
->>>>>>> 725445bde095435f47f8bc948873818794f00365
     },
     },
     "jake": {
     "jake": {
       "version": "10.8.2",
       "version": "10.8.2",
@@ -1815,7 +1813,7 @@
         "jsbn": "~0.1.0",
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.0.2",
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
         "tweetnacl": "~0.14.0"
-      }
+      },
       "sqlstring": {
       "sqlstring": {
         "version": "2.3.1",
         "version": "2.3.1",
         "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
         "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
@@ -2145,4 +2143,5 @@
         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
       }
       }
     }
     }
+  }
 }
 }

@@ -170,8 +170,6 @@ function checkAuthenticated(req, res, next) {
       res.redirect("/index");
       res.redirect("/index");
     });
     });
 }
 }
-<<<<<<< HEAD
-=======
 
 
 router.get("/map", (req, res) => {
 router.get("/map", (req, res) => {
   console.log(req.session.user);
   console.log(req.session.user);
@@ -183,4 +181,3 @@ router.get('/logout',function(req,res){
   req.session.destroy();  //세션비우기
   req.session.destroy();  //세션비우기
   res.redirect('/');
   res.redirect('/');
 });
 });
->>>>>>> 725445bde095435f47f8bc948873818794f00365