2026-06-24 복구

2026-06-24 18:11:59 +09:00
parent 5ebb11395c
commit b92bb65ba6
6 changed files with 12 additions and 37 deletions
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,10 +1,7 @@
 {
  "dependencies": {
-<<<<<<< HEAD
    "com.unity.2d.sprite": "1.0.0",
-=======
    "com.unity.ai.navigation": "2.0.13",
->>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
    "com.unity.burst": "1.8.27",
    "com.unity.cinemachine": "3.1.7",
    "com.unity.cloud.gltfast": "6.19.0",