# fix merge conflicts and test cases · gitcafe/zig

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

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

Visibility: public

Requested revision: 44f9061b718e9bdcd43d258291f89930b74aa56a

Requested commit: 44f9061b718e9bdcd43d258291f89930b74aa56a

Commit: 44f9061b718e9bdcd43d258291f89930b74aa56a

Tree: bb753832ef6ab9ed8fb3bc873222627453033639

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts and test cases

```

## Parents

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

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