PropagateDownload: Create conflict even if local file changed
authorChristian Kamm <mail@ckamm.de>
Wed, 6 Feb 2019 14:12:57 +0000 (15:12 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:40 +0000 (10:58 +0100)
commit797734870fb0751177958c63c9c398e4aca9f720
tree79fe3d6826d60bbd3e7599ba7f36c4ec13ab8a8b
parent8a8e93827f53ef0349d883c61b7d05ea429a697d
PropagateDownload: Create conflict even if local file changed

Fixes a bug introduced while moving the attribute propagation before the
conflict-renaming.
src/libsync/propagatedownload.cpp