PR #74157 Fix merge conflicts

Fix merge conflicts #74157

eps1lon merged 2 commits into canary from sebbie/12-19-fix_merge_conflicts

Fix merge conflicts

5feb0e54

ijjk added created-by: Next.js team

ijjk added tests

Merge branch 'canary' into sebbie/12-19-fix_merge_conflicts

73eae873

eps1lon marked this pull request as ready for review 1 year ago

eps1lon requested a review from

gaojude 1 year ago

gaojude approved these changes on 2024-12-19

eps1lon merged 5ff21003 into canary 1 year ago

eps1lon deleted the sebbie/12-19-fix_merge_conflicts branch 1 year ago

github-actions added locked

github-actions locked as resolved and limited conversation to collaborators 1 year ago

Reviewers

gaojude

Assignees

No one assigned

Labels

created-by: Next.js team locked tests

Milestone

No milestone