[FIX] update dotfiles

OCA · Feb 11, 2025 · 7a25435 · 7a25435
1 parent ccf0b88
commit 7a25435
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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