From cc82294cd970d67f6258bf61ca887de898ff4d67 Mon Sep 17 00:00:00 2001
From: Pierre Ryssen <pierre.ryssen@epitech.eu>
Date: Mon, 30 Mar 2026 17:26:36 +0200
Subject: [PATCH] feat: add packages

---
 Packages/packages-lock.json | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 110fb13..f60ddb5 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,19 +1,18 @@
 {
   "dependencies": {
-<<<<<<<<< Temporary merge branch 1
+    "com.merry-yellow.code-assist": {
+      "version": "file:com.merry-yellow.code-assist",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.autodesk.fbx": {
       "version": "5.1.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
-=========
-    "com.merry-yellow.code-assist": {
-      "version": "file:com.merry-yellow.code-assist",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {}
->>>>>>>>> Temporary merge branch 2
+
     },
     "com.unity.ai.navigation": {
       "version": "2.0.10",