# fix merge conflicts for this branch · gitcafe/zig

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

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

Visibility: public

Requested revision: 46f93807aaf4d9c1ea2000cda5ad46ea6f212b3e

Requested commit: 46f93807aaf4d9c1ea2000cda5ad46ea6f212b3e

Commit: 46f93807aaf4d9c1ea2000cda5ad46ea6f212b3e

Tree: 4e9d264e22c11b520fbf1cf934971feb2d09a568

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts for this branch

```

## Parents

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

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