# fix merge conflicts · gitcafe/zig

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

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

Visibility: public

Requested revision: 31e0b5c3c76022daababd9065a9359343cf2b34f

Requested commit: 31e0b5c3c76022daababd9065a9359343cf2b34f

Commit: 31e0b5c3c76022daababd9065a9359343cf2b34f

Tree: 51713be1e81ea138ec2c68b8108e514bbdaf64b8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts

partially reapply b636d56d6a71b9ed521de7fccb519b7d0fa3db90

```

## Parents

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

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