[stable-34.1.x] Nmc/1901 Conflict dialog#574

github-actions[bot] wants to merge 1 commit into

stable-34.1.xnextmcloud/android:stable-34.1.xfrom

backport/nmc/62/stable-34.1.xnextmcloud/android:backport/nmc/62/stable-34.1.xCopy head branch name to clipboard