fix: remove merge marker

viyatb-oai · viyatb-oai · commit 0b0d20675139 · 2026-03-27T14:35:04.000-07:00
Co-authored-by: Codex noreply@openai.com
diff --git a/codex-rs/core/src/codex_tests.rs b/codex-rs/core/src/codex_tests.rs
@@ -5310,7 +5310,6 @@ async fn unified_exec_rejects_escalated_permissions_when_policy_not_on_request()
 }
 
 #[tokio::test]
-<<<<<<< HEAD
 async fn session_start_hooks_only_load_from_trusted_project_layers() -> std::io::Result<()> {
     let temp = tempfile::tempdir()?;
     let codex_home = temp.path().join("home");

Original file line number	Diff line number	Diff line change
`@@ -5310,7 +5310,6 @@ async fn unified_exec_rejects_escalated_permissions_when_policy_not_on_request()`
`5310`	`5310`	`}`
`5311`	`5311`
`5312`	`5312`	`#[tokio::test]`
`5313`		`-<<<<<<< HEAD`
`5314`	`5313`	`async fn session_start_hooks_only_load_from_trusted_project_layers() -> std::io::Result<()> {`
`5315`	`5314`	`let temp = tempfile::tempdir()?;`
`5316`	`5315`	`let codex_home = temp.path().join("home");`