Skip to content

Fix semantic merge conflict#9967

Merged
karencfv merged 1 commit intooxidecomputer:mainfrom
karencfv:fix-semantic-merge
Mar 4, 2026
Merged

Fix semantic merge conflict#9967
karencfv merged 1 commit intooxidecomputer:mainfrom
karencfv:fix-semantic-merge

Conversation

@karencfv
Copy link
Contributor

@karencfv karencfv commented Mar 4, 2026

Result of running cargo xtask openapi generate

@karencfv karencfv requested a review from iliana March 4, 2026 01:44
@karencfv karencfv merged commit e7545dd into oxidecomputer:main Mar 4, 2026
21 of 22 checks passed
@karencfv karencfv deleted the fix-semantic-merge branch March 4, 2026 10:31
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 this pull request may close these issues.

3 participants