# Resolved merge conflict\. · gitcafe/zig

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

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

Visibility: public

Requested revision: 255c0ef40688342aa07f2b51be06791715fc8ae0

Requested commit: 255c0ef40688342aa07f2b51be06791715fc8ae0

Commit: 255c0ef40688342aa07f2b51be06791715fc8ae0

Tree: 489339ad9f5e4eeb9c5fffab8b1a16b19234981e

Author: Alexandros Naskos

Committer: Alexandros Naskos

## Message

```
Resolved merge conflict.

```

## Parents

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

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

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