From eea7800df31f30caabfec2aefe8f20008365a8e8 Mon Sep 17 00:00:00 2001
From: Josh Lehman <josh@martian.engineering>
Date: Tue, 24 Mar 2026 22:24:08 -0700
Subject: [PATCH] Tests: remove provider auth conflict marker

---
 src/infra/provider-usage.auth.normalizes-keys.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/infra/provider-usage.auth.normalizes-keys.test.ts b/src/infra/provider-usage.auth.normalizes-keys.test.ts
index f91a986432d..22f8f1ba281 100644
--- a/src/infra/provider-usage.auth.normalizes-keys.test.ts
+++ b/src/infra/provider-usage.auth.normalizes-keys.test.ts
@@ -98,7 +98,6 @@ describe("resolveProviderAuths key normalization", () => {
     suiteCase = 0;
   });
 
-<<<<<<< HEAD
   beforeEach(async () => {
     vi.resetModules();
     ({ resolveProviderAuths } = await import("./provider-usage.auth.js"));