From c1f404ad537ded5a584525f7f89dcf5705a2c405 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 2 Jan 2023 16:41:13 -0700
Subject: [PATCH] Compilation: fix merge conflict with previous commit

---
 src/Compilation.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compilation.zig b/src/Compilation.zig
index be6b8cb4bc..a18b05a939 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -1458,7 +1458,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
             .gpa = gpa,
             .manifest_dir = try options.local_cache_directory.handle.makeOpenPath("h", .{}),
         };
-        cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
+        cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
         cache.addPrefix(options.zig_lib_directory);
         cache.addPrefix(options.local_cache_directory);
         errdefer cache.manifest_dir.close();