blade/materialious
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
WardPearce
2025-11-28 15:22:11 +13:00
parent 22e5374cf1 7b120dbe7d
commit 920df47157
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
materialious/package-lock.json
Generated
+7 -4
View File
@@ -63,8 +63,11 @@
"svelte-check": "^4.3.3",
"tslib": "^2.7.0",
"typescript": "^5.9.3",
<<<<<<< HEAD
"typescript-eslint": "^8.47.0",
"vite": "^7.1.12"
"vite": "^7.2.4"
>>>>>>> origin/dependabot/npm_and_yarn/materialious/vite-7.2.4
}
},
"node_modules/@babel/code-frame": {
@@ -12501,9 +12504,9 @@
}
},
"node_modules/vite": {
"version": "7.1.12",
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
"integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
"version": "7.2.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz",
"integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==",
"dev": true,
"license": "MIT",
"dependencies": {
materialious/package.json
+4 -1
View File
@@ -36,8 +36,11 @@
"svelte-check": "^4.3.3",
"tslib": "^2.7.0",
"typescript": "^5.9.3",
<<<<<<< HEAD
"typescript-eslint": "^8.47.0",
"vite": "^7.1.12"
"vite": "^7.2.4"
>>>>>>> origin/dependabot/npm_and_yarn/materialious/vite-7.2.4
},
"type": "module",
"dependencies": {