[stable-3.32] Nmc/1901 Conflict dialog#349

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

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