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

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

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

Visibility: public

Requested revision: 10b6bc2508a7ef6041a035ef2cc507e73e0ccd47

Requested commit: 10b6bc2508a7ef6041a035ef2cc507e73e0ccd47

Commit: 10b6bc2508a7ef6041a035ef2cc507e73e0ccd47

Tree: 30240ece0e0cc3a9abd529e77c38de758abcdf92

Author: Mikayla Maki

Committer: GitHub

## Message

```
Fix broken merge (#24341)

Release Notes:

- N/A
```

## Parents

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

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