# editor: Fix compile errors after bad merge \(\#25374\) · gitcafe/zed

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

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

Visibility: public

Requested revision: b9ca2402428934d35d62d2d4e217e86e5657cb6c

Requested commit: b9ca2402428934d35d62d2d4e217e86e5657cb6c

Commit: b9ca2402428934d35d62d2d4e217e86e5657cb6c

Tree: bcbc53f479a8a2627b467bffd3a6796c93b3d3f7

Author: Marshall Bowers

Committer: GitHub

## Message

```
editor: Fix compile errors after bad merge (#25374)

This PR fixes the compile errors after
https://github.com/zed-industries/zed/pull/25367 was merged without
passing CI.

Release Notes:

- N/A
```

## Parents

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

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