Failed to remove a line at conflict resolution during JW revert at [1]. [1]: https://github.com/odoo/odoo/commit/e5572c317a7775a58675ed73efc89b5c9f6c0c39 task-2424849 closes odoo/odoo#63908 X-original-commit: 15fd0b765d38199961d4210f362770216af23a42 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>