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

build: fix SC2086 (backport #1933) #1934

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2024


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

(cherry picked from commit ab776b8)

# Conflicts:
#	adm/templates/profile
@mergify mergify bot added the conflicts label Aug 30, 2024
Copy link
Contributor Author

mergify bot commented Aug 30, 2024

Cherry-pick of ab776b8 has failed:

On branch mergify/bp/release_2.2/pr-1933
Your branch is up to date with 'origin/release_2.2'.

You are currently cherry-picking commit ab776b82.
  (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:   adm/templates/profile

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

@mergify mergify bot deleted the mergify/bp/release_2.2/pr-1933 branch August 30, 2024 12:32
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.

1 participant