From b7d9426e735dca029736f91c1eec570de3fcf37d Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Mon, 10 Feb 2025 19:47:09 +0100
Subject: [PATCH] [FIX] checklog-odoo.cfg conflict

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

diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg
index 29ef1b984..0b55b7bf6 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