-
Grégory Oestreicher authored
The conflict dialog will only be shown for local update / remote update conflicts. For cases where one side deleted the item while it was updated on the other, the deleting side loses the conflict automatically to prevent data loss. BUG: 335090 BUG: 338570 FIXED-IN: 4.14.10
44d38d36