[stable-3.34] Nmc/1901 Conflict dialog#423

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

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