# Fix merge-conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: bde67b2b9c6fff9d1977e43efd251bff023a53b0

Requested commit: bde67b2b9c6fff9d1977e43efd251bff023a53b0

Commit: bde67b2b9c6fff9d1977e43efd251bff023a53b0

Tree: 4f31028ca33bbee330e425dccdaedd433a01fed1

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Fix merge-conflict

```

## Parents

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

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