# avoid conflict with master branch · gitcafe/zig

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

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

Visibility: public

Requested revision: 27575d19c805e166d8393e3c586613256eb0c6e3

Requested commit: 27575d19c805e166d8393e3c586613256eb0c6e3

Commit: 27575d19c805e166d8393e3c586613256eb0c6e3

Tree: da14133cfbcd961a28b9a831c6085d78b8766b6f

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
avoid conflict with master branch

```

## Parents

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

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