974348: Resolved the conflicts#601

Priyadharshini-SF3813 wants to merge 1 commit intodevelopmentsyncfusion-content/ej2-javascript-docs:developmentfrom

EJ2-974348-ResolveConflictssyncfusion-content/ej2-javascript-docs:EJ2-974348-ResolveConflictsCopy head branch name to clipboard