first

README.md

+<<<<<<< HEAD
 # NgDemo
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.12.
@@ -25,3 +26,6 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 ## Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+=======
+
+>>>>>>> b03a763330ae547c24ec4e6666e76ae37de3c84d