Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

chore(appliance): fix a failing test#64002

Merged
craigfurman merged 1 commit into
mainfrom
fix-appliance-test
Jul 23, 2024
Merged

chore(appliance): fix a failing test#64002
craigfurman merged 1 commit into
mainfrom
fix-appliance-test

Conversation

@craigfurman

Copy link
Copy Markdown
Contributor

Semantic merge conflict in a test fixture, not caught by actual merge conflict though.

Test plan

Tests all pass.

Changelog

Semantic merge conflict in a test fixture, not caught by actual merge
conflict though.
@craigfurman craigfurman added the no-changelog Exclude this PR from the next changelog. label Jul 23, 2024
@craigfurman craigfurman requested review from a team and Chickensoupwithrice July 23, 2024 08:52
@cla-bot cla-bot Bot added the cla-signed label Jul 23, 2024
@craigfurman craigfurman enabled auto-merge (squash) July 23, 2024 08:52
@craigfurman craigfurman merged commit 6e31f0f into main Jul 23, 2024
@craigfurman craigfurman deleted the fix-appliance-test branch July 23, 2024 08:57
craigfurman pushed a commit that referenced this pull request Jul 31, 2024
Semantic merge conflict in a test fixture, not caught by actual merge
conflict though.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed no-changelog Exclude this PR from the next changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants