yeah a fix for the sync
This commit is contained in:
parent
08b68e224d
commit
c9080dae4e
@ -1172,7 +1172,7 @@ const dispatchOperationToActualV3 = async (
|
||||
r.key
|
||||
);
|
||||
if (conflictAction === "smart_conflict") {
|
||||
if (isMergable(r.remote!)) {
|
||||
if (isMergable(r.local!)) {
|
||||
await clearFileContentHistoryByVaultAndProfile(
|
||||
db,
|
||||
vaultRandomID,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user