[stable-3.33] Nmc/1901 Conflict dialog#389

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

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