# link.MachO: fix merge conflict artifact · gitcafe/zig

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

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

Visibility: public

Requested revision: a418c595464470a74f99f019cf735b6ee778cd3f

Requested commit: a418c595464470a74f99f019cf735b6ee778cd3f

Commit: a418c595464470a74f99f019cf735b6ee778cd3f

Tree: 2316f2fd74496575c2d230749379e5ad84c14582

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
link.MachO: fix merge conflict artifact

This happened from cherry-picking bug fixes from master branch.

```

## Parents

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

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