Commit ceeeab4a authored by Vincent Bechu's avatar Vincent Bechu

replicateStorage: fix confict handling keep local

parent a7ee771f
...@@ -494,8 +494,10 @@ ...@@ -494,8 +494,10 @@
use_bulk_get: use_bulk_get, use_bulk_get: use_bulk_get,
conflict_force: (context._conflict_handling === conflict_force: (context._conflict_handling ===
CONFLICT_KEEP_REMOTE), CONFLICT_KEEP_REMOTE),
conflict_ignore: (context._conflict_handling === conflict_ignore: ((context._conflict_handling ===
CONFLICT_CONTINUE), CONFLICT_CONTINUE) ||
(context._conflict_handling ===
CONFLICT_KEEP_LOCAL)),
check_modification: context._check_remote_modification, check_modification: context._check_remote_modification,
check_creation: context._check_remote_creation, check_creation: context._check_remote_creation,
check_deletion: context._check_remote_deletion check_deletion: context._check_remote_deletion
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment