# assistant2: Fix broken merge \(\#27081\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 394215599acdfe4be8355e998e7abdfbe862212e

Requested commit: 394215599acdfe4be8355e998e7abdfbe862212e

Commit: 394215599acdfe4be8355e998e7abdfbe862212e

Tree: 1e60bc6c0d936679a205d1e25120a0f54359d82c

Author: Marshall Bowers

Committer: GitHub

## Message

```
assistant2: Fix broken merge (#27081)

This PR fixes a broken merge caused by
https://github.com/zed-industries/zed/pull/26987 landing after
https://github.com/zed-industries/zed/pull/26758.

Release Notes:

- N/A
```

## Parents

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

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