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][FIX] stock_ux: avoid attr replace on views #359

Merged
merged 1 commit into from Jan 10, 2023

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #358

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

@Bruno-Zanotti @nicomacr cherrypicking of pull request #358 failed.

stdout:

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

stderr:

20:16:58.892746 git.c:439               trace: built-in: git cherry-pick 874a28f9fa1a02a51f189e54b0ec8075cc427e02
error: could not apply 874a28f9... [FIX] stock_ux: avoid attr replace on views
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.

@nicomacr nicomacr merged commit 437046c into ingadhoc:16.0 Jan 10, 2023
@nicomacr nicomacr deleted the 16.0-15.0-h-57228-bz-IKpZ-fw branch January 10, 2023 11:35
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.

None yet

4 participants