Skip to content

Commit 3331edf

Browse files
committed
merge conflicts
2 parents 6366eec + 4cf5782 commit 3331edf

File tree

2 files changed

+92
-0
lines changed

2 files changed

+92
-0
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42+
<<<<<<< HEAD
4243
"@layercode/js-sdk": "^2.8.4"
44+
=======
45+
"@layercode/js-sdk": "2.8.3"
46+
>>>>>>> main
4347
},
4448
"devDependencies": {
4549
"@rollup/plugin-commonjs": "^25.0.8",

0 commit comments

Comments
 (0)