ingadhoc / website

ADHOC Odoo Website related Addons
GNU Affero General Public License v3.0
20 stars 31 forks source link

[FW][IMP] website_sale_ux: the name of the "pay now" button is changed #276

Closed fw-bot-adhoc closed 8 months ago

fw-bot-adhoc commented 8 months ago

Forward-Port-Of: ingadhoc/website#274

roboadhoc commented 8 months ago

Pull request status dashboard.

fw-bot-adhoc commented 8 months ago

@lef-adhoc @matiasperalta1 cherrypicking of pull request ingadhoc/website#274 failed.

stdout:

Auto-merging website_sale_ux/__manifest__.py
CONFLICT (content): Merge conflict in website_sale_ux/__manifest__.py

stderr:

15:08:31.418413 git.c:444               trace: built-in: git cherry-pick 3783bbba1918f2dfd1d65f54bce90d16ed901b85
error: could not apply 3783bbb... [IMP] website_sale_ux: the name of the "pay now" button is changed
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'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

matiasperalta1 commented 8 months ago

@roboadhoc r+