Resolve merge conflicts using incoming branch

2026-03-10 15:26:52 +01:00
parent e07fb7dc4b 8c4c2b372b
commit 94e44ad7af
136 changed files with 11173 additions and 218 deletions
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,11 @@
 {
  "dependencies": {
+    "com.merry-yellow.code-assist": {
+      "version": "file:com.merry-yellow.code-assist",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
    "com.unity.ai.navigation": {
      "version": "2.0.10",
      "depth": 0,