From c6c3ca139f1c7b002b3b5b4b35a46d8f20e5aaba Mon Sep 17 00:00:00 2001
From: Alfonso Diaz Hernandez <57547835+muquifuler@users.noreply.github.com>
Date: Tue, 18 Apr 2023 22:50:48 +0200
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index a4920f0..0498eb0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # iassistance README
 
 This is the README for your extension "iassistance". After writing up a brief description, we recommend including the following sections.