# re-apply a commit dropped in this branch due to conflicts · gitcafe/zig

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

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

Visibility: public

Requested revision: 1a492d5156df400d33a00c5717e049e17f514153

Requested commit: 1a492d5156df400d33a00c5717e049e17f514153

Commit: 1a492d5156df400d33a00c5717e049e17f514153

Tree: 45eb88a9bbe93fe8d4e6ccbf57286a766a822f73

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
re-apply a commit dropped in this branch due to conflicts

This commit reapplies 4f0aa7d639e099b18df583cb984412037fbb1dbe.

```

## Parents

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

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