# Merge branch 'main' of github.com:zed-industries/zed into prompt_template · gitcafe/zed

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

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

Visibility: public

Requested revision: 4b8771f3e2f46674c3b61a651eaf8f994089ee63

Requested commit: 4b8771f3e2f46674c3b61a651eaf8f994089ee63

Commit: 4b8771f3e2f46674c3b61a651eaf8f994089ee63

Tree: 79bdc92f96e55f521cfb8ebb516dfafbda017022

Author: KCaverly

Committer: KCaverly

## Message

```
Merge branch 'main' of github.com:zed-industries/zed into prompt_template

```

## Parents

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

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

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