# Fix semantic merge conflict \(\#45078\) · gitcafe/zed

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

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

Visibility: public

Requested revision: edcde6d90c4a82a3ab64dda91e56bafaded28bc5

Requested commit: edcde6d90c4a82a3ab64dda91e56bafaded28bc5

Commit: edcde6d90c4a82a3ab64dda91e56bafaded28bc5

Tree: d777e952b3c9e7ae1c4a56c93568f34d91f6d32f

Author: Lukas Wirth

Committer: GitHub

## Message

```
Fix semantic merge conflict (#45078)

Release Notes:

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

## Parents

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

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