Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW] Revert "[FIX] report quotation: Fix when image column is displayed" #629

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

This reverts commit 87daf76.

Forward-Port-Of: #628

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@matiasperalta1 cherrypicking of pull request #628 failed.

stdout:

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

stderr:

15:01:36.542125 git.c:444               trace: built-in: git cherry-pick 0e8d1ba0c4a3a2cd5dbd49749ece081843bfabb6
error: could not apply 0e8d1ba0... Revert "[FIX] report quotation: Fix when image column is displayed"
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.

@matiasperalta1
Copy link
Contributor

@fw-bot-adhoc r+

@fw-bot-adhoc
Copy link
Contributor Author

@matiasperalta1 I can only do this on unmodified forward-port PRs, ask roboadhoc.

@matiasperalta1
Copy link
Contributor

@roboadhoc r+

roboadhoc pushed a commit that referenced this pull request Mar 14, 2024
This reverts commit 87daf76.

closes #629

X-original-commit: 6cf12e8
Signed-off-by: matiasperalta1 <mnp@adhoc.com.ar>
@roboadhoc roboadhoc closed this Mar 14, 2024
@fw-bot-adhoc fw-bot-adhoc deleted the 15.0-13.0-h-58649-mnp2-e1xe-fw branch March 28, 2024 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants