Merge branch 'master' of https://scm.barhendev.com/barhen/teso_business

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Fuse - Admin template and Starter project for Angular
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli)
@@ -25,3 +26,8 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice.  To
 ## 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.
+=======
+# teso_business
+
+Teso Business 2.0 angular source code
+>>>>>>> e6c4973c4071fb8ad7638dfc40778a5c33290b5d