mirror of
https://github.com/hexedtech/codemp.git
synced 2024-12-23 13:24:54 +01:00
Revert "(to alemi: always has been) fix: try now lmao."
This reverts commit 1b5b9e74bf
.
This commit is contained in:
parent
1b5b9e74bf
commit
6c30699acc
1 changed files with 1 additions and 1 deletions
|
@ -140,7 +140,7 @@ impl ControllerWorker<TextChange> for BufferWorker {
|
|||
// x.0.start should always be after lastver!
|
||||
// this step_ver will be the version after we apply the operation
|
||||
// we give it to the controller so that he knows where it's at.
|
||||
let step_ver = oplog.version_union(&[lv.end], &last_ver);
|
||||
let step_ver = oplog.version_union(&[lv.start], &last_ver);
|
||||
branch.merge(&oplog, &step_ver);
|
||||
let new_local_v = branch.local_version();
|
||||
|
||||
|
|
Loading…
Reference in a new issue