fix: merge issue

This commit is contained in:
linonetwo
2023-01-12 17:22:13 +08:00
parent 1a82fdb8b3
commit 1b3bdda061
4 changed files with 54 additions and 194 deletions

View File

@@ -28,6 +28,7 @@
"dependencies": {
"@blocksuite/blocks": "0.3.1-20230109032243-37ad3ba",
"@blocksuite/store": "0.3.1-20230109032243-37ad3ba",
"@tauri-apps/api": "^1.2.0",
"debug": "^4.3.4",
"encoding": "^0.1.13",
"firebase": "^9.15.0",
@@ -36,7 +37,8 @@
"ky-universal": "^0.11.0",
"lib0": "^0.2.58",
"swr": "^2.0.0",
"y-protocols": "^1.0.5"
"y-protocols": "^1.0.5",
"yjs": "^13.5.44"
},
"peerDependencies": {
"@blocksuite/blocks": "0.3.1-*",