Skip to content

Commit 0e27d6c

Browse files
pedrobaezapedrobaeza
authored
Merge pull request OCA#1025 from StefanRijnhart/18.0-fix-checklog-odoo.cfg
[18.0][FIX] checklog-odoo.cfg: conflict after automatic pre-commit update
2 parents a885871 + e5f77d0 commit 0e27d6c

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎checklog-odoo.cfg

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
[checklog-odoo]
22
ignore=
3-
<<<<<<< before updating
4-
WARNING.*0 failed, 0 error\(s\).*
5-
=======
63
WARNING.* 0 failed, 0 error\(s\).*
7-
>>>>>>> after updating

0 commit comments

Comments
 (0)