updated README.md

README.md

@@ -1,32 +1,3 @@
-<<<<<<< HEAD
 # NG_table
-Table using jsonplaceholder to retrieve data, pipes to filter and hilite terms fitlered on
-=======
-# NGTable
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.9.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
-
-## 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.
->>>>>>> aa68187b45d17930e28456ad6908ed91e20af3a5
+Table using jsonplaceholder to retrieve data, pipes to filter and hilite terms fitlered on