# fix merge conflicts from master branch · gitcafe/zig

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

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

Visibility: public

Requested revision: 9cb06f3b8bf9ea6b5e5307711bc97328762d6a1d

Requested commit: 9cb06f3b8bf9ea6b5e5307711bc97328762d6a1d

Commit: 9cb06f3b8bf9ea6b5e5307711bc97328762d6a1d

Tree: 8de05a9471692ef22f09cbf9690abe64ecda45c5

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts from master branch

```

## Parents

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

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