# translate-c: fix botched merge conflict · gitcafe/zig

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

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

Visibility: public

Requested revision: 70e935db5bc16e5a7144dd0de3176d53dd892301

Requested commit: 70e935db5bc16e5a7144dd0de3176d53dd892301

Commit: 70e935db5bc16e5a7144dd0de3176d53dd892301

Tree: 2bf0334734b9e2ae30a17f0af31f4066c2b8bbb5

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
translate-c: fix botched merge conflict

Previous commit failed to correctly solve the translate-c merge
conflict; this commit fixes it.

```

## Parents

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

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