mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update surfer dependency to version 1.9.3 and resolve merge conflicts in lock file

Browse Source
This commit is contained in:
mr. M
2025-01-07 20:42:30 +01:00
parent 3d61e4ed68
commit 379ccdf33d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -36,7 +36,7 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
"@zen-browser/surfer": "^1.9.2"
"@zen-browser/surfer": "^1.9.3"
},
"devDependencies": {
"husky": "^9.1.7",

24
pnpm-lock.yaml generated
View File

@@ -9,13 +9,8 @@ importers:
.:
dependencies:
'@zen-browser/surfer':
<<<<<<< HEAD
specifier: ^1.9.2
version: 1.9.2
=======
specifier: ^1.9.1
version: 1.9.1(glob@7.2.3)
>>>>>>> 34e5e6c151ccf30add3f477cc243a84f4648e558
specifier: ^1.9.3
version: 1.9.3(glob@7.2.3)
devDependencies:
husky:
specifier: ^9.1.7
@@ -127,13 +122,8 @@ packages:
'@types/node@17.0.45':
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
<<<<<<< HEAD
'@zen-browser/surfer@1.9.2':
resolution: {integrity: sha512-QysaMuuESQfLySWBQSHsr6ezEBJUdcIx2kpY21gc+NjGxz4RyPnlBbZ5AxL2Ws98YYer6+0b761umidqWLAv/g==}
=======
'@zen-browser/surfer@1.9.1':
resolution: {integrity: sha512-IM3ru9bzcLdeB995s7pHVZRlvJZ399IkUHNe16UYV95YCTtlJDEkkepbvz/oHXZGjDUnx43ip9kQqTZit69/1g==}
>>>>>>> 34e5e6c151ccf30add3f477cc243a84f4648e558
'@zen-browser/surfer@1.9.3':
resolution: {integrity: sha512-D53XK4/jQcgJKHESjixezCazYTw7orN3Bnogv5RzITRvm79ftYtzSvkrdNwMsmoTJRro8am7VvBLIDfsj2UBeA==}
hasBin: true
ansi-escapes@7.0.0:
@@ -1046,11 +1036,7 @@ snapshots:
'@types/node@17.0.45': {}
<<<<<<< HEAD
'@zen-browser/surfer@1.9.2':
=======
'@zen-browser/surfer@1.9.1(glob@7.2.3)':
>>>>>>> 34e5e6c151ccf30add3f477cc243a84f4648e558
'@zen-browser/surfer@1.9.3(glob@7.2.3)':
dependencies:
'@resvg/resvg-js': 1.4.0
async-icns: 1.0.2