# Fix incorrectly resolved merge conflicts · gitcafe/zig

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

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

Visibility: public

Requested revision: e043fe474ffe07d1503c6cb70e01983b8d07a1ba

Requested commit: e043fe474ffe07d1503c6cb70e01983b8d07a1ba

Commit: e043fe474ffe07d1503c6cb70e01983b8d07a1ba

Tree: a4cfce82b6a4239f2a1d203e211db29345b4c1e3

Author: mlugg

Committer: mlugg

## Message

```
Fix incorrectly resolved merge conflicts

To be honest, I can't be bothered to figure out which commits these
changes should be in.

```

## Parents

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

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