refactor(conflict-resolve-activity)#16625

alperozturk96 merged 1 commit intomasternextcloud/android:masterfrom

refactor/conflict-resolve-activitynextcloud/android:refactor/conflict-resolve-activityCopy head branch name to clipboard