Berufsschule/Webshop
Berufsschule/Webshop
Template
5
2
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 3 Wiki Activity

merge conflict fix

Browse Source
This commit is contained in:
Fabian 2025-04-11 08:13:41 +02:00
commit 0b58034238
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -11,6 +11,9 @@
"dependencies": { "dependencies": {
"dotenv": "^16.4.7", "dotenv": "^16.4.7",
"express": "^4.21.2", "express": "^4.21.2",
"app-root-path": "^3.1.0",
"dotenv": "^16.4.5",
"express": "^4.21.1",
"express-session": "^1.18.1", "express-session": "^1.18.1",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"mysql2": "^3.12.0", "mysql2": "^3.12.0",
@ -29,6 +32,15 @@
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/app-root-path": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz",
"integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==",
"license": "MIT",
"engines": {
"node": ">= 6.0.0"
}
},
"node_modules/array-flatten": { "node_modules/array-flatten": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",

3
package.json
View File

@ -11,6 +11,9 @@
"license": "ISC", "license": "ISC",
"description": "Webshop Autohändler", "description": "Webshop Autohändler",
"dependencies": { "dependencies": {
"app-root-path": "^3.1.0",
"dotenv": "^16.4.5",
"express": "^4.21.1",
"dotenv": "^16.4.7", "dotenv": "^16.4.7",
"express": "^4.21.2", "express": "^4.21.2",
"express-session": "^1.18.1", "express-session": "^1.18.1",