# Rebase \- Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :\( · gitcafe/zed

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

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

Visibility: public

Requested revision: 3451a3c7fe40234fec3db826993961f19ab1f816

Requested commit: 3451a3c7fe40234fec3db826993961f19ab1f816

Commit: 3451a3c7fe40234fec3db826993961f19ab1f816

Tree: ccdabbeee46053e7fd8cf40fc8748271a7236fab

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :(

Co-Authored-By: kay@zed.dev

```

## Parents

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

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