[stable-3.31] Nmc/1901 Conflict dialog#323

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

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