# Fix semantic merge conflict from RelPath refactor \(\#38829\) · gitcafe/zed

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

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

Visibility: public

Requested revision: d321cf93ba074542f10b99e95d055059eec076e2

Requested commit: d321cf93ba074542f10b99e95d055059eec076e2

Commit: d321cf93ba074542f10b99e95d055059eec076e2

Tree: d8b662f63025819dfc1e7c676078ac0f22cd1dcc

Author: Cole Miller

Committer: GitHub

## Message

```
Fix semantic merge conflict from RelPath refactor (#38829)

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
```

## Parents

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

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