Fix merge conflict
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Thu, 2 Jan 2020 07:43:34 +0000 (08:43 +0100)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Thu, 2 Jan 2020 07:43:34 +0000 (08:43 +0100)
commit7653c5fa605718618cd769526b40e5a6164dd969
tree37071fdf1a6867ca71f8736793193aa705e74c38
parent44bfc79caac1bbd8e1187fc84435219ea2af2a9b
parentbd61cd3142fcc7bad365c4d96616bafb1e88feda
Fix merge conflict

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/owncloudgui.cpp
src/gui/settingsdialog.cpp