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

[release-3.2] Add i18n items for the PipelineRun role #2749

Closed
ks-ci-bot opened this issue Dec 6, 2021 · 0 comments · Fixed by #2750
Closed

[release-3.2] Add i18n items for the PipelineRun role #2749

ks-ci-bot opened this issue Dec 6, 2021 · 0 comments · Fixed by #2750
Assignees

Comments

@ks-ci-bot
Copy link
Collaborator

Manual cherrypick required.

#2669 failed to apply on top of branch "release-3.2":

Applying: Add i18n items for pipelinerun role
Using index info to reconstruct a base tree...
M	locales/en/role.js
Falling back to patching base and 3-way merge...
Auto-merging locales/en/role.js
CONFLICT (content): Merge conflict in locales/en/role.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add i18n items for pipelinerun role
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

Successfully merging a pull request may close this issue.

3 participants