[stable-3.35] Nmc/1901 Conflict dialog#455

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

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