# Fix merge conflicts · gitcafe/zed

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

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

Visibility: public

Requested revision: 8a0db5f6597b22ac0ccbdffe82a23e785f95969b

Requested commit: 8a0db5f6597b22ac0ccbdffe82a23e785f95969b

Commit: 8a0db5f6597b22ac0ccbdffe82a23e785f95969b

Tree: 18305b9818cb83cc9a27918e871f5ee866a3c088

Author: Anthony

Committer: Anthony

## Message

```
Fix merge conflicts

```

## Parents

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

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

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