fix(conflict-resolve-activity): threading#16776

alperozturk96 merged 1 commit intomasternextcloud/android:masterfrom

fix/conflict-resolve-threadingnextcloud/android:fix/conflict-resolve-threadingCopy head branch name to clipboard