# autodocs: fix merge conflict · gitcafe/zig

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

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

Visibility: public

Requested revision: 75d39a97a29a4dee905a4c2b1f06444312be3a77

Requested commit: 75d39a97a29a4dee905a4c2b1f06444312be3a77

Commit: 75d39a97a29a4dee905a4c2b1f06444312be3a77

Tree: e83e7c25460d2037b687e29d8d7a92ab4f888943

Author: Loris Cro

Committer: Andrew Kelley

## Message

```
autodocs: fix merge conflict

```

## Parents

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

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