sdraris/ptitspas-ynov-back-sosso
1
0
Fork 0
forked from Ynov/ptitspas-ynov-back
Code Pull Requests Activity

Nettoyage des marqueurs de conflit dans package.json

Browse Source
This commit is contained in:
ynov-deploy 2025-08-26 17:31:28 +02:00
parent c7e4a572a0
commit e17c8f7616
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -31,12 +31,6 @@
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"class-validator": "^0.14.2", "class-validator": "^0.14.2",
"joi": "^18.0.0", "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", "mapped-types": "^0.0.1",
"passport-jwt": "^4.0.1", "passport-jwt": "^4.0.1",
"pg": "^8.16.3", "pg": "^8.16.3",
@ -44,7 +38,6 @@
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.1", "swagger-ui-express": "^5.0.1",
"typeorm": "^0.3.26" "typeorm": "^0.3.26"
>>>>>>> d79f16d (WIP: modifs package)
}, },
"devDependencies": { "devDependencies": {
"@eslint/eslintrc": "^3.2.0", "@eslint/eslintrc": "^3.2.0",