Skip to content

Commit a20ffa6

Browse files
Fixed merge conflict.
1 parent 8f3fbd6 commit a20ffa6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
},
4949
"dependencies": {
5050
"@firebolt-js/sdk": "^1.4.1",
51-
<<<<<<< HEAD
52-
"@lightningjs/blits": "^1.36.0"
53-
=======
5451
"@lightningjs/blits": "^1.38.2"
55-
>>>>>>> dev
5652
}
5753
}

0 commit comments

Comments
 (0)