[stable-3.29] Nmc/1901 Conflict dialog#239

github-actions[bot] wants to merge 1 commit intostable-3.29nextmcloud/android:stable-3.29from

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