Skip to content

chore: Fix broken build due to semantic merge conflict - #1612

Closed
dwahler wants to merge 1 commit into
mainfrom
david/fix-merge-conflict
Closed

dwahler wants to merge 1 commit into
mainfrom
david/fix-merge-conflict

Conversation

@dwahler

@dwahler dwahler commented May 19, 2022

Copy link
Copy Markdown
Contributor

The main branch currently doesn't build because of an incorrect automatic merge.

The api local variable in coderd.New was effectively renamed to become a parameter to coderd.newRouter called a in #1568. #1567 passed its tests before this change, using the old name, but was merged afterwards without retesting.

@dwahler
dwahler requested review from f0ssel and spikecurtis May 19, 2022 23:13
@dwahler

dwahler commented May 19, 2022

Copy link
Copy Markdown
Contributor Author

Looks like this is a duplicate of #1611 (jinx!)

@dwahler dwahler closed this May 19, 2022
dwahler added a commit that referenced this pull request Aug 18, 2022
@github-actions
github-actions Bot deleted the david/fix-merge-conflict branch February 4, 2023 20:04
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.

1 participant