# Fix merge conflicts · gitcafe/zed

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

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

Visibility: public

Requested revision: a441e1ef408996cff2a98195459292bd44b66454

Requested commit: a441e1ef408996cff2a98195459292bd44b66454

Commit: a441e1ef408996cff2a98195459292bd44b66454

Tree: cb581185fa7a337e1770266a23ac8f468a79c8b0

Author: Anthony

Committer: Anthony

## Message

```
Fix merge conflicts

```

## Parents

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

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

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