# fix merge conflicts from previous commit · gitcafe/zig

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

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

Visibility: public

Requested revision: 2299e5ff1dc924a2dca0c0c2def6f1e7b71a668f

Requested commit: 2299e5ff1dc924a2dca0c0c2def6f1e7b71a668f

Commit: 2299e5ff1dc924a2dca0c0c2def6f1e7b71a668f

Tree: f725a2508a71c9ed55c1aca55ab3eb7d4748d61d

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts from previous commit

Any PRs merged after the one that made testing functions return errors
needs to get rebased!

```

## Parents

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

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