# Wire in conflict styling · gitcafe/zed

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

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

Visibility: public

Requested revision: ef81813d569fb1d815eaba2f5aebaa7a4157610f

Requested commit: ef81813d569fb1d815eaba2f5aebaa7a4157610f

Commit: ef81813d569fb1d815eaba2f5aebaa7a4157610f

Tree: 3fe2bd6ac1d5a395a9d8ce60ff8b7bba5558beaa

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Wire in conflict styling

```

## Parents

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

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