stdout: stderr: closes odoo/odoo#58605 Error: could not apply 2b65a7c1112... [IMP] l10n_ar: Accounting Tour adaptation Hint: after resolving the conflicts, mark the corrected paths Hint: with 'git add <paths>' or 'git rm <paths>' Hint: and commit the result with 'git commit' Signed-off-by: Josse Colpaert <jco@openerp.com>