# fix merge conflict from previous commit · gitcafe/zig

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

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

Visibility: public

Requested revision: d9e8671d963dc99ec8b4721f53d77828efa232ed

Requested commit: d9e8671d963dc99ec8b4721f53d77828efa232ed

Commit: d9e8671d963dc99ec8b4721f53d77828efa232ed

Tree: 861acf53602452698c82a1bfa2b69f347292a4c2

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflict from previous commit

```

## Parents

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

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