fix: merge issue

This commit is contained in:
linonetwo
2023-01-11 23:57:54 +08:00
parent 107419cb8d
commit ac1ddba094
3 changed files with 3428 additions and 93 deletions
+3 -2
View File
@@ -26,9 +26,9 @@
"typescript": "^4.8.4"
},
"dependencies": {
"@tauri-apps/api": "^1.2.0",
"@blocksuite/blocks": "0.4.0-20230110112105-ef07332",
"@blocksuite/store": "0.4.0-20230110112105-ef07332",
"@tauri-apps/api": "^1.2.0",
"debug": "^4.3.4",
"encoding": "^0.1.13",
"firebase": "^9.15.0",
@@ -37,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-*",