Skip to content

Fix merge issue in docs #8807

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
Merged
begelundmuller merged 1 commit into from
Feb 10, 2026
Merged

Fix merge issue in docs #8807

begelundmuller merged 1 commit into from
Feb 10, 2026
+49 −5

Conversation

@begelundmuller
Copy link
Contributor

@begelundmuller begelundmuller commented Feb 10, 2026

Found this unhandled merge conflict on main in docs/api/rill/admin/v1/public.swagger.yaml:

<<<<<<< HEAD
      refresh:
        type: boolean
=======
      attributes:
        type: object
>>>>>>> main

Regenerated the docs to fix.

@begelundmuller begelundmuller self-assigned this Feb 10, 2026
@begelundmuller begelundmuller merged commit 571a7c5 into main Feb 10, 2026
11 checks passed
@begelundmuller begelundmuller deleted the begelundmuller/fix-docs-merge-issue branch February 10, 2026 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@royendo royendo royendo approved these changes

Assignees

@begelundmuller begelundmuller

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@begelundmuller @royendo