Skip to content

Commit cd45f3a

Browse files
committed
fix: rebase
1 parent a76e47b commit cd45f3a

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

npm/src/install.mjs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -349,21 +349,11 @@ function isPlatformSpecificPackageInstalled() {
349349

350350
// Skip downloading the binary if it was already installed via optionalDependencies
351351
if (!isPlatformSpecificPackageInstalled()) {
352-
<<<<<<< HEAD:npm/src/install.ts
353352
console.log('Platform specific package not found. Will manually download binary.')
354353
downloadBinaryFromRegistry().catch(error => {
355354
console.error(colors.red, 'Failed to download binary:', error, colors.reset)
356355
process.exitCode = 1
357356
})
358-
||||||| parent of 5d8bf5f6c8 (save):npm/src/install.ts
359-
console.log('Platform specific package not found. Will manually download binary.')
360-
downloadBinaryFromRegistry()
361-
=======
362-
console.log(
363-
'Platform specific package not found. Will manually download binary.'
364-
)
365-
downloadBinaryFromRegistry()
366-
>>>>>>> 5d8bf5f6c8 (save):npm/src/install.mjs
367357
} else {
368358
console.log(
369359
'Platform specific package already installed. Skipping manual download.'

0 commit comments

Comments
 (0)