# Remove remnants from conflict resolution \(\#3528\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 2a68a6171aa7b2a2e1189048addf13a23f26dc8a

Requested commit: 2a68a6171aa7b2a2e1189048addf13a23f26dc8a

Commit: 2a68a6171aa7b2a2e1189048addf13a23f26dc8a

Tree: debe42febaa1bf50fe457bde0154a16b265a7eeb

Author: Joseph T\. Lyons

Committer: GitHub

## Message

```
Remove remnants from conflict resolution (#3528)

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
```

## Parents

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

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