919816: Resolved Conflict Files

Author: Manikandan-Lakshmanan

ej2-angular/getting-started/angular-cli.md

@@ -300,4 +300,4 @@ Syncfusion has a collection of sample applications that demonstrate the use of S
 * [Getting Started with Angular CLI as Front end in ASP.NET MVC](./aspnet-mvc)
 * [Getting started with Ionic and Angular](./ionic)
 * [Getting started with Angular and Electron](./electron)
-* [Upgradation Guide](../upgrade/upgrading-syncfusion)
+* [Upgradation Guide](../upgrade/upgrading-syncfusion)