# Fix merge conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: b801e0a46eb58889f652ad13ab614be80f1ef39c

Requested commit: b801e0a46eb58889f652ad13ab614be80f1ef39c

Commit: b801e0a46eb58889f652ad13ab614be80f1ef39c

Tree: f3073e36c2ffaaf343639bb097a8cef92d90a72d

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Fix merge conflict

```

## Parents

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

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