k

package-lock.json

@@ -3651,11 +3651,6 @@
     },
     "@testing-library/jest-dom": {
       "version": "4.2.4",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz",
-      "integrity": "sha512-j31Bn0rQo12fhCWOUWy9fl7wtqkp7In/YP2p5ZFyRuiiB9Qs3g+hS4gAmDWONbAHcRmVooNJ5eOHQDCOmUFXHg==",
-=======
->>>>>>> Sangjune
       "requires": {
         "@babel/runtime": "^7.5.1",
         "chalk": "^2.4.1",
@@ -5090,14 +5085,11 @@
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
-<<<<<<< HEAD
     "bootstrap": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.1.tgz",
       "integrity": "sha512-bxUooHBSbvefnIZfjD0LE8nfdPKrtiFy2sgrxQwUZ0UpFzpjVbVMUxaGIoo9XWT4B2LG1HX6UQg0UMOakT0prQ=="
     },
-=======
->>>>>>> Sangjune
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -9490,14 +9482,6 @@
         "supports-color": "^6.1.0"
       }
     },
-<<<<<<< HEAD
-    "jquery": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-    },
-=======
->>>>>>> Sangjune
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -11137,14 +11121,6 @@
         "ts-pnp": "^1.1.6"
       }
     },
-<<<<<<< HEAD
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
-    },
-=======
->>>>>>> Sangjune
     "portfinder": {
       "version": "1.0.27",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.27.tgz",
@@ -12327,11 +12303,6 @@
     },
     "react": {
       "version": "16.13.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
-      "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
-=======
->>>>>>> Sangjune
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -12543,11 +12514,6 @@
     },
     "react-dom": {
       "version": "16.13.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
-      "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
-=======
->>>>>>> Sangjune
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -12584,11 +12550,6 @@
     },
     "react-router-dom": {
       "version": "5.2.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
-=======
->>>>>>> Sangjune
       "requires": {
         "@babel/runtime": "^7.1.2",
         "history": "^4.9.0",
@@ -12611,11 +12572,6 @@
     },
     "react-scripts": {
       "version": "3.4.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.1.tgz",
-      "integrity": "sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ==",
-=======
->>>>>>> Sangjune
       "requires": {
         "@babel/core": "7.9.0",
         "@svgr/webpack": "4.3.3",