- Fix merge conflict

#deploy-test-dolly-frontend

Author: stigus

apps/dolly-frontend/src/main/js/package.json

@@ -23,12 +23,12 @@
 	"license": "ISC",
 	"dependencies": {
 		"@hookform/resolvers": "^5.4.0",
-		"@navikt/aksel-icons": "^8.11.0",
+		"@navikt/aksel-icons": "^8.11.1",
 		"@popperjs/core": "^2.11.8",
 		"axios": "^1.16.1",
 		"classnames": "^2.5.1",
 		"country-data-list": "^1.6.3",
-		"date-fns": "^4.3.0",
+		"date-fns": "^4.4.0",
 		"dayjs": "^1.11.21",
 		"history": "^5.3.0",
 		"immer": "^11.1.8",
@@ -56,9 +56,9 @@
 	"devDependencies": {
 		"@babel/core": "^7.29.7",
 		"@hookform/error-message": "^2.0.1",
-		"@navikt/aksel": "^8.11.0",
-		"@navikt/ds-css": "^8.11.0",
-		"@navikt/ds-react": "^8.11.0",
+		"@navikt/aksel": "^8.11.1",
+		"@navikt/ds-css": "^8.11.1",
+		"@navikt/ds-react": "^8.11.1",
 		"@playwright/experimental-ct-react": "^1.60.0",
 		"@playwright/test": "^1.60.0",
 		"@reduxjs/toolkit": "^2.12.0",
@@ -84,7 +84,7 @@
 		"babel-plugin-react-compiler": "^1.0.0",
 		"babel-plugin-styled-components": "^2.3.0",
 		"dot-prop": "^10.1.0",
-		"eslint": "^10.4.0",
+		"eslint": "^10.4.1",
 		"eslint-config-prettier": "^10.1.8",
 		"eslint-plugin-react": "^7.37.5",
 		"eslint-plugin-react-compiler": "19.1.0-rc.2",
@@ -98,7 +98,7 @@
 		"react-dropzone": "^15.0.0",
 		"react-pdf": "^10.4.1",
 		"react-redux": "^9.3.0",
-		"react-router": "^7.15.1",
+		"react-router": "^7.16.0",
 		"sass": "^1.100.0",
 		"swr": "^2.4.1",
 		"typescript": "^6.0.3",