projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 67e81fc) | patch
Add a conflict dialog to help the user solve them
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 7 Oct 2020 15:51:18 +0000 (17:51 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 14:40:46 +0000 (16:40 +0200)
commit49c478cd2aaef1533d0c19981f0968e6f8c49385
tree0c8bd7beaf51a0adb3a8d35933eb131599b0e72atree | snapshot
parent67e81fcd0f97e89752237ea5e030cf2b4dbbfa5fcommit | diff
Add a conflict dialog to help the user solve them

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/CMakeLists.txt diff | blob | history
src/gui/conflictdialog.cpp [new file with mode: 0644] blob
src/gui/conflictdialog.h [new file with mode: 0644] blob
src/gui/conflictdialog.ui [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.