[stable-3.30] Nmc/1901 Conflict dialog#291

surinder-tsys wants to merge 1 commit intostable-3.30nextmcloud/android:stable-3.30from

backport/nmc/62/stable-3.30nextmcloud/android:backport/nmc/62/stable-3.30Copy head branch name to clipboard