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

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

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

Visibility: public

Requested revision: 482a45feacdddba417deaf92e9751aa2a4de5c66

Requested commit: 482a45feacdddba417deaf92e9751aa2a4de5c66

Commit: 482a45feacdddba417deaf92e9751aa2a4de5c66

Tree: 2c47822238bbac16e361134590735b7710b686e5

Author: Cole Miller

Committer: GitHub

## Message

```
Fix broken merge (#25776)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
```

## Parents

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

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