projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 351bada) | patch
FolderWatcher: Always notify about conflict files #7073
authorChristian Kamm <mail@ckamm.de>
Wed, 6 Mar 2019 13:22:18 +0000 (14:22 +0100)
committerCamila (Rebase PR Action) <hello@camila.codes>
Tue, 24 Nov 2020 16:56:49 +0000 (16:56 +0000)
commit21b931dc6b5d14565413c8fee432c5bd8a89c893
tree43980b283f14df596c91c83825b4f0366796fc0etree | snapshot
parent351bada5522dffad89665650d30d63b64d0c7e8dcommit | diff
FolderWatcher: Always notify about conflict files #7073

This makes sure that the conflict list can be updated if a user resolves
a conflict by deleting the local conflict file. Previously one had to
wait for the next sync run.
src/gui/folderwatcher.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.