From c6d8e12810f82379c5c772cf8c0ecc0496ed678d Mon Sep 17 00:00:00 2001
From: barhen <43050223+barhen@users.noreply.github.com>
Date: Wed, 19 Jan 2022 09:22:03 +0000
Subject: [PATCH] Description..

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 23d2a42..ea1e39f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Teso Business 2.0
 
 The Teso Business 2.0 angular source code