From e8d17251871d0d789872a275ca9b448efb33c354 Mon Sep 17 00:00:00 2001
From: joshavant <830519+joshavant@users.noreply.github.com>
Date: Tue, 24 Feb 2026 15:07:29 -0600
Subject: [PATCH] Onboard auth: remove leftover merge marker

---
 src/commands/onboard-auth.credentials.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commands/onboard-auth.credentials.ts b/src/commands/onboard-auth.credentials.ts
index 9448169978c..8e512cd2133 100644
--- a/src/commands/onboard-auth.credentials.ts
+++ b/src/commands/onboard-auth.credentials.ts
@@ -206,7 +206,6 @@ export async function setAnthropicApiKey(
   });
 }
 
-<<<<<<< HEAD
 export async function setOpenaiApiKey(
   key: SecretInput,
   agentDir?: string,