From e17c8f7616ef81706229bb45f8158bf35ae31042 Mon Sep 17 00:00:00 2001
From: ynov-deploy <ynov-deploy@ptits-pas.fr>
Date: Tue, 26 Aug 2025 17:31:28 +0200
Subject: [PATCH] Nettoyage des marqueurs de conflit dans package.json

---
 package.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package.json b/package.json
index f3b8a19..14428aa 100644
--- a/package.json
+++ b/package.json
@@ -31,12 +31,6 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
     "joi": "^18.0.0",
-<<<<<<< HEAD
-    "class-validator": "^0.14.0",
-    "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1",
-    "typeorm": "^0.3.17"
-=======
     "mapped-types": "^0.0.1",
     "passport-jwt": "^4.0.1",
     "pg": "^8.16.3",
@@ -44,7 +38,6 @@
     "rxjs": "^7.8.1",
     "swagger-ui-express": "^5.0.1",
     "typeorm": "^0.3.26"
->>>>>>> d79f16d (WIP: modifs package)
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",