Skip to content

Commit dd0f286

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into release-1.4.x
# Conflicts: # Cargo.lock # crates/loro-internal/Cargo.toml # crates/loro/Cargo.toml
2 parents b6498b4 + d3a1bb5 commit dd0f286

86 files changed

Lines changed: 3565 additions & 1257 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/late-gifts-jog.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ node_modules/
1010
coverage/
1111
trace-*.json
1212
.loro
13+
loom_test.json

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"Leeeon",
2525
"Liangrun",
2626
"LOGSTORE",
27+
"Merkle",
2728
"napi",
2829
"nextest",
2930
"opgroup",
@@ -57,7 +58,7 @@
5758
"rust-analyzer.cargo.features": [
5859
"jsonpath",
5960
"counter",
60-
// "test_utils"
61+
"test_utils"
6162
],
6263
"editor.defaultFormatter": "rust-lang.rust-analyzer",
6364
"rust-analyzer.server.extraEnv": {

0 commit comments

Comments
 (0)