# Fix conflict marker in project diff view \(\#26466\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 28f33d01035b622817663dc98d9a814fc40ff44e

Requested commit: 28f33d01035b622817663dc98d9a814fc40ff44e

Commit: 28f33d01035b622817663dc98d9a814fc40ff44e

Tree: 824f679ecfb05cf417315e41a0591f6d53f6712b

Author: Conrad Irwin

Committer: GitHub

## Message

```
Fix conflict marker in project diff view (#26466)

Closes #ISSUE

Release Notes:

- N/A

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

## Parents

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

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