Skip to content

Resolve semantic merge conflict#48999

Merged
Veykril merged 1 commit intomainfrom
push-mmuqyyumuwwk
Feb 12, 2026
Merged

Resolve semantic merge conflict#48999
Veykril merged 1 commit intomainfrom
push-mmuqyyumuwwk

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Feb 12, 2026

Caused by #48763 and #48800

Release Notes:

  • N/A or Added/Fixed/Improved ...

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 12, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 12, 2026
@Veykril Veykril enabled auto-merge (squash) February 12, 2026 07:47
@Veykril Veykril merged commit a679789 into main Feb 12, 2026
37 checks passed
@Veykril Veykril deleted the push-mmuqyyumuwwk branch February 12, 2026 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant