# Fixed merge conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: 415e28e2d3719ae1335636f501f3f93cb71a5c0b

Requested commit: 415e28e2d3719ae1335636f501f3f93cb71a5c0b

Commit: 415e28e2d3719ae1335636f501f3f93cb71a5c0b

Tree: f5a1ecc1aa38a32f100f3096411ae3648b174c8f

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixed merge conflict

```

## Parents

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

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