ingadhoc/website#328
Created by fw-bot-adhoc
Blocked
- Merge method
- Review
-
CI
- ci/runbot-oba: Odoo by Adhoc without running tests
- ci/runbot-modified-modules: (runtime 2s)
- label
- adhoc-dev:17.0-16.0-h-80857-mnp-WFI7-fw
- head
- bb5fddbb96d05d3a1137b23e7d511c5619720b7a
- target
- 17.0
- forward-port of
- ingadhoc/website#326 DETACHED (conflicts: ('3e54263dffbb3d69168c44a829019043c4251101', 'Auto-merging website_sale_ux/i18n/es.po\nCONFLICT (content): Merge conflict in website_sale_ux/i18n/es.po\nAuto-merging website_sale_ux/README.rst\n', "15:21:34.149316 git.c:444 trace: built-in: git cherry-pick 3e54263dffbb3d69168c44a829019043c4251101\nerror: could not apply 3e54263... [REF] website_sale_ux: translation corrected\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['3e54263dffbb3d69168c44a829019043c4251101']) ('3e54263dffbb3d69168c44a829019043c4251101', 'Auto-merging website_sale_ux/i18n/es.po\nCONFLICT (content): Merge conflict in website_sale_ux/i18n/es.po\nAuto-merging website_sale_ux/README.rst\n', "15:21:34.149316 git.c:444 trace: built-in: git cherry-pick 3e54263dffbb3d69168c44a829019043c4251101\nerror: could not apply 3e54263... [REF] website_sale_ux: translation corrected\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['3e54263dffbb3d69168c44a829019043c4251101']))
[FW][REF] website_sale_ux: translation corrected
Forward-Port-Of: ingadhoc/website#326