Nmc/1901 Conflict dialog#62

surinder-tsys wants to merge 1 commit intomasternextmcloud/android:masterfrom

nmc/1901-conflict_dialognextmcloud/android:nmc/1901-conflict_dialogCopy head branch name to clipboard