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

fix: keep customer/supplier website role by default (backport #37532) #37534

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2023

This is an automatic backport of pull request #37532 done by Mergify.
Cherry-pick of d2096cf has failed:

On branch mergify/bp/version-13-hotfix/pr-37532
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit d2096cfdb7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/setup/install.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Oct 16, 2023
@mergify mergify bot assigned ankush Oct 16, 2023
@ankush ankush closed this Oct 16, 2023
@ankush ankush reopened this Oct 16, 2023
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-37532 branch from bcf43b1 to 52aff1f Compare October 16, 2023 12:05
@ankush ankush merged commit fe681ac into version-13-hotfix Oct 16, 2023
5 of 6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37532 branch October 16, 2023 12:07
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.54.5 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants