# Fix merge conflict \(\#11232\) · gitcafe/zed

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

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

Visibility: public

Requested revision: b18ca1585e058b51577703a6ce274a16b5a5cfe9

Requested commit: b18ca1585e058b51577703a6ce274a16b5a5cfe9

Commit: b18ca1585e058b51577703a6ce274a16b5a5cfe9

Tree: b63081570f07305f1cc9528f631bc8da88be2d42

Author: Conrad Irwin

Committer: GitHub

## Message

```
Fix merge conflict (#11232)

Release Notes:

- N/A
```

## Parents

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

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