# Fixed merge conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: 9209c0dfeb6dd85566ad1df26cc41b2ce8fe5f9d

Requested commit: 9209c0dfeb6dd85566ad1df26cc41b2ce8fe5f9d

Commit: 9209c0dfeb6dd85566ad1df26cc41b2ce8fe5f9d

Tree: 3c626624832e5dd7e3b51195a2b0df1196d1a240

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixed merge conflict

```

## Parents

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

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