fix: 코드 충돌 해결

choooz · Oct 18, 2023 · 65d7857 · 65d7857
1 parent b765bbb
commit 65d7857
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 56 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/apps/jurumarble/package.json b/apps/jurumarble/package.json
@@ -52,11 +52,7 @@
     "eslint": "^8.51.0",
     "eslint-config-mogakko": "workspace:*",
     "prettier": "^2.8.1",
-<<<<<<< HEAD
     "typescript": "5.0.4",
-=======
-    "typescript": "5.2.2",
->>>>>>> 8ec64c6 (feat: docker compose & docker image setting)
     "typescript-plugin-css-modules": "^5.0.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -8238,16 +8238,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:[email protected]#~builtin<compat/typescript>":
-  version: 5.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=d73830"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
-  languageName: node
-  linkType: hard
-
 "ua-parser-js@npm:^1.0.33":
   version: 1.0.36
   resolution: "ua-parser-js@npm:1.0.36"