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

[stable/zed] fix: Barbican use same uwsgi config as other services. #1144

Closed
vexxhost-bot opened this issue Apr 21, 2024 · 0 comments
Closed
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

#1119 failed to apply on top of branch "stable/zed":

Applying: fix: Barbican use same uwsgi config as other services
Using index info to reconstruct a base tree...
M	.charts.yml
Falling back to patching base and 3-way merge...
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: Barbican use same uwsgi config as other services
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants