# Fixed merge conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: 8c1054fbb6998b09606f40c8aaa20f229c0b6f5c

Requested commit: 8c1054fbb6998b09606f40c8aaa20f229c0b6f5c

Commit: 8c1054fbb6998b09606f40c8aaa20f229c0b6f5c

Tree: 197fefb2489e6840e62f184548999d39744e0eff

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixed merge conflict

```

## Parents

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

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