# std.fs.test: fix rebase conflicts · gitcafe/zig

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

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

Visibility: public

Requested revision: 018e34271fe58e540dc46e8bca529ce399625bef

Requested commit: 018e34271fe58e540dc46e8bca529ce399625bef

Commit: 018e34271fe58e540dc46e8bca529ce399625bef

Tree: 280e3df33e81da7c5a09c6de567047498e286b83

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
std.fs.test: fix rebase conflicts

```

## Parents

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

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