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.

Sign up for GitHub

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

Jump to bottom

chore: update links to Frappe School (backport #46823) #46844

Open
wants to merge 1 commit into
base: version-15-hotfix
Choose a base branch
from
Open

chore: update links to Frappe School (backport #46823) #46844

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 2, 2025

This is an automatic backport of pull request #46823 done by [Mergify](https://mergify.com).

@NagariaHussain @mergify
chore: update links to Frappe School (#46823)
2dfe13e 
(cherry picked from commit ef4f662)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/buying/workspace/buying/buying.json
#	erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#	erpnext/projects/workspace/projects/projects.json
#	erpnext/selling/workspace/selling/selling.json
#	erpnext/stock/workspace/stock/stock.json
@mergify mergify bot added the conflicts label Apr 2, 2025
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 2, 2025

Cherry-pick of ef4f662 has failed:

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

You are currently cherry-picking commit ef4f662c31.
  (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)

Changes to be committed:
	modified:   README.md
	modified:   erpnext/setup/install.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/workspace/accounting/accounting.json
	both modified:   erpnext/buying/workspace/buying/buying.json
	both modified:   erpnext/manufacturing/workspace/manufacturing/manufacturing.json
	both modified:   erpnext/projects/workspace/projects/projects.json
	both modified:   erpnext/selling/workspace/selling/selling.json
	both modified:   erpnext/stock/workspace/stock/stock.json

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

@github-actions github-actions bot added needs-tests This PR needs automated unit-tests. skip-release-notes This PR should not be mentioned in the release notes labels Apr 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees

@NagariaHussain NagariaHussain

Labels
conflicts needs-tests This PR needs automated unit-tests. skip-release-notes This PR should not be mentioned in the release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@NagariaHussain