From af143c60bbd5603f3059d86cba5382e4c94cf0dc Mon Sep 17 00:00:00 2001
From: Dylan Hurd <dylan.hurd@openai.com>
Date: Sun, 24 Aug 2025 22:38:03 -0700
Subject: [PATCH] [tools] patch merge conflict

---
 codex-rs/core/src/openai_tools.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codex-rs/core/src/openai_tools.rs b/codex-rs/core/src/openai_tools.rs
index ca4e947bd2..60fbbca225 100644
--- a/codex-rs/core/src/openai_tools.rs
+++ b/codex-rs/core/src/openai_tools.rs
@@ -724,6 +724,7 @@ mod tests {
             SandboxPolicy::ReadOnly,
             false,
             false,
+            false,
             /*use_experimental_streamable_shell_tool*/ false,
         );