# Fix broken merge \(\#27551\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/29e2e13e6ded1edf636774ebdf7facd2f6ac59d4)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 29e2e13e6ded1edf636774ebdf7facd2f6ac59d4

Requested commit: 29e2e13e6ded1edf636774ebdf7facd2f6ac59d4

Commit: 29e2e13e6ded1edf636774ebdf7facd2f6ac59d4

Tree: 01940b48d4351d7267203788ef872b0121283edf

Author: Cole Miller

Committer: GitHub

## Message

```
Fix broken merge (#27551)

This PR fixes main after a semantic merge conflict with
https://github.com/zed-industries/zed/pull/27391.

Release Notes:

- N/A
```

## Parents

- [e635798fe0827c08929a3610aee2d73e2ff2faa7](https://git.cafe/gitcafe/zed/commit/e635798fe0827c08929a3610aee2d73e2ff2faa7?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/29e2e13e6ded1edf636774ebdf7facd2f6ac59d4?format=markdown)