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

Merge the two pages for contribute a hook #1899

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

matks
Copy link
Contributor

@matks matks commented Dec 9, 2024

Questions Answers
Branch? 8.x
Description? Merge the two pages for contribute a hook to avoid duplicate content. Use a redirection to keep links and menu relevant.
Fixed ticket?

@kpodemski
Copy link
Contributor

ohh, there are conflicts after the first PR has been merged

@matks
Copy link
Contributor Author

matks commented Dec 9, 2024

So the PR created by me has conflicts because of the PR created by me

I don't need an enemy, I got myself

@matks matks force-pushed the merge-add-hook-docs branch from 245125c to 8fadbc8 Compare December 9, 2024 15:51
@matks
Copy link
Contributor Author

matks commented Dec 9, 2024

@kpodemski Conflicts resolved

@kpodemski kpodemski merged commit 018a0ea into PrestaShop:8.x Dec 9, 2024
2 checks passed
@matks matks deleted the merge-add-hook-docs branch December 9, 2024 16:13
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.

2 participants