# Merge branch 'SpexGuy-fix-comptime-cityhash' · gitcafe/zig

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

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

Visibility: public

Requested revision: 5cc2e500e68a60cb99b48755af39856ff60198b6

Requested commit: 5cc2e500e68a60cb99b48755af39856ff60198b6

Commit: 5cc2e500e68a60cb99b48755af39856ff60198b6

Tree: b00e28d6f15de11b468bea413562b8d45c24f46e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'SpexGuy-fix-comptime-cityhash'

I commented out the comptime test though since it was causing OOM on the
CI server.

closes #7331

```

## Parents

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

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

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