docs: fix merge conflict in extended.md - #146
Merged
Merged
Conversation
✅ Deploy Preview for docs-projectcapsule ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
sandert-k8s
approved these changes
Oct 1, 2026
sandert-k8s
left a comment
sandert-k8s
left a comment
Collaborator
There was a problem hiding this comment.
Whoops, good catch! Thanks
Collaborator
|
Can you fix the dco @lemacbacon ? (you can ignore the |
lemacbacon
force-pushed
the
patch-1
branch
2 times, most recently
from
October 1, 2026 18:39
ca8c7ab to
66d4ab3
Compare
Resolve merge conflict by updating the name of the group from 'tenant:{{ .tenant.metadata.name }}:operators' to 'solar:operators'.
Signed-off-by: Clément Legrand <legrand.clement@gmail.com>
lemacbacon
changed the title
Contributor
Author
It has been fixed 👌 |
sandert-k8s
approved these changes
Oct 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolve merge conflict by updating the name of the group from 'tenant:{{ .tenant.metadata.name }}:operators' to 'solar:operators'.