BWDO-808 fix conflict resolution bug#67

BenjiMilan merged 1 commit into

developrdkcentral/sc:developfrom

feature/BWDO-808_bugfix_automatic_conflict_resolutionrdkcentral/sc:feature/BWDO-808_bugfix_automatic_conflict_resolutionCopy head branch name to clipboard