Tests: remove provider auth conflict marker

2026-03-27 18:01:46 +00:00 · 2026-03-24 22:24:08 -07:00
parent c733d5040d
commit eea7800df3
1 changed files with 0 additions and 1 deletions
--- 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"));