# C ABI tests: fix merge conflict with x86/i386 · gitcafe/zig

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

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

Visibility: public

Requested revision: b9ea086812a080458446af94685a8b23eb3f3bc8

Requested commit: b9ea086812a080458446af94685a8b23eb3f3bc8

Commit: b9ea086812a080458446af94685a8b23eb3f3bc8

Tree: b70333203c6aeafb38711a697e11506627033ed5

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
C ABI tests: fix merge conflict with x86/i386

```

## Parents

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

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