From 0295310417096a6714db0466c6a47643ff04a820 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Tue, 18 Feb 2025 09:48:43 +0100
Subject: [PATCH] Update checklog-odoo.cfg

---
 checklog-odoo.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg
index 29ef1b98..0b55b7bf 100644
--- a/checklog-odoo.cfg
+++ b/checklog-odoo.cfg
@@ -1,7 +1,3 @@
 [checklog-odoo]
 ignore=
-<<<<<<< before updating
-    WARNING.*0 failed, 0 error\(s\).*
-=======
     WARNING.* 0 failed, 0 error\(s\).*
->>>>>>> after updating