[Customer Portal MicroApp]: (fix) resolve unresolved merge conflict markers - #1058

[Customer Portal MicroApp]: (fix) resolve unresolved merge conflict markers#1058

Rashmika998 merged 1 commit into

wso2-open-operations:mainwso2-open-operations/cs-tools:mainfrom

2003dinijay:dinijay/fix/merge-conflict-markers2003dinijay/cs-tools:dinijay/fix/merge-conflict-markersCopy head branch name to clipboard