Rename isActivityIgnored() to isUnsolvableconflict()
authorFelix Weilbach <felix.weilbach@nextcloud.com>
Wed, 10 Mar 2021 09:22:33 +0000 (10:22 +0100)
committerFelix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de>
Thu, 11 Mar 2021 09:42:38 +0000 (09:42 +0000)
commite3ac63e9ff850e0628cbdc5f067afa57b643b1ae
tree4b6de0ec1cc64563dec05c8bb755571249644f8e
parent05d31e2e53d30e2ec10ceb832608427291a109fd
Rename isActivityIgnored() to isUnsolvableconflict()

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
src/gui/tray/UserModel.cpp
src/gui/tray/UserModel.h