AJR/TechradarDev
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: résolution des marqueurs de conflit dans radar-app/package.json

Browse Source 
- Conservation de Next.js 16.1.6 et eslint-config-next 16.1.6

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
syoul
2026-02-25 18:37:40 +01:00
parent 6c304d461c
commit e9fd40f27d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
radar-app/package.json
View File

@@ -24,11 +24,7 @@
"@types/react-dom": "^19", "@types/react-dom": "^19",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"eslint": "^9.23.0", "eslint": "^9.23.0",
<<<<<<< HEAD
"eslint-config-next": "16.1.6", "eslint-config-next": "16.1.6",
=======
"eslint-config-next": "15.2.4",
>>>>>>> main
"fuse.js": "^7.1.0", "fuse.js": "^7.1.0",
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
@@ -36,11 +32,7 @@
"lint-staged": "^15.5.0", "lint-staged": "^15.5.0",
"marked": "^15.0.7", "marked": "^15.0.7",
"marked-highlight": "^2.2.1", "marked-highlight": "^2.2.1",
<<<<<<< HEAD
"next": "16.1.6", "next": "16.1.6",
=======
"next": "15.2.4",
>>>>>>> main
"postcss-nested": "^7.0.2", "postcss-nested": "^7.0.2",
"postcss-preset-env": "^10.1.5", "postcss-preset-env": "^10.1.5",
"prettier": "^3.5.3", "prettier": "^3.5.3",