projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fdb203) | patch
Add KeepBothVersions as a possible solution to ConflictSolver
authorKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 8 Oct 2020 13:54:32 +0000 (15:54 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 14:40:46 +0000 (16:40 +0200)
commit67e81fcd0f97e89752237ea5e030cf2b4dbbfa5f
tree6862c1c8968e0017ce24d142e695b440bc3e7e93tree | snapshot
parent4fdb203cdb39ead4ab6fc16a9323f7fad65cb53dcommit | diff
Add KeepBothVersions as a possible solution to ConflictSolver

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/conflictsolver.cpp diff | blob | history
src/gui/conflictsolver.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.