Skip to content

Commit 548528d

Browse files
committed
Fix merge conflict
2 parents aeb886c + 1ab03b6 commit 548528d

File tree

2 files changed

+19
-36
lines changed

2 files changed

+19
-36
lines changed

package-lock.json

Lines changed: 17 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"preview": "vite preview"
1010
},
1111
"devDependencies": {
12-
"sass": "^1.77.8",
13-
"vite": "^5.4.2"
12+
"sass": "^1.78.0",
13+
"vite": "^5.4.3"
1414
},
1515
"dependencies": {
1616
"@adafruit/ble-file-transfer-js": "adafruit/ble-file-transfer-js#1.0.2",

0 commit comments

Comments
 (0)