# Fix merge conflicts · gitcafe/zed

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

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

Visibility: public

Requested revision: 54006054833b6b8b55beadd2cf03550c49d0adb4

Requested commit: 54006054833b6b8b55beadd2cf03550c49d0adb4

Commit: 54006054833b6b8b55beadd2cf03550c49d0adb4

Tree: 14d1d6bc0ed58d7fcf96db1c890416703401fc47

Author: Mikayla

Committer: Mikayla

## Message

```
Fix merge conflicts

```

## Parents

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

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