# zig fmt: Fix merge errors · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/7841c9b7d105a62ccb55f4f6589d5ff31194a013)

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

Visibility: public

Requested revision: 7841c9b7d105a62ccb55f4f6589d5ff31194a013

Requested commit: 7841c9b7d105a62ccb55f4f6589d5ff31194a013

Commit: 7841c9b7d105a62ccb55f4f6589d5ff31194a013

Tree: f7c975ae11f17fa7ab6bfa24f2d1a4b6cf98000f

Author: Lachlan Easton

Committer: Lachlan Easton

## Message

```
zig fmt: Fix merge errors

```

## Parents

- [671b3abe5d6661a8bca452a0a16dea7ae3d0e516](https://git.cafe/gitcafe/zig/commit/671b3abe5d6661a8bca452a0a16dea7ae3d0e516?format=markdown)

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