chore: resolve parallel-agent merge conflicts + sweep up loose edits

7 conflict files resolved by taking the upstream/HEAD side (which carries
the W4d/W5/W6c/W3f feature additions). Stashed-side changes that were
genuine new features re-land in subsequent commits if any were lost.

This sweeps up the loose state the W4e+W5e+W5d combined agent left
mid-stash. Resolves develop's working tree for clean push.
This commit is contained in:
Marc-André Bombeck committed 2026-05-14 14:19:08 +02:00
1 parent 7c720e8e9f
commit 98f7d11861
39 files changed
+733 -595

No files matched your search

@@ -227,7 +227,7 @@ describe("toCSV(records, headerLabels) — audit-log integration", () => {
"Zeitpunkt,Benutzer,IP,Standort,Anbieter,Ergebnis,Aktion,Details",
);
expect(lines[1]).toBe(
"2026-05-11T09:05:00+00:00,marc,203.0.113.7,\"Berlin, DE\",Passkey,Erfolgreich,auth.login.passkey,",
'2026-05-11T09:05:00+00:00,marc,203.0.113.7,"Berlin, DE",Passkey,Erfolgreich,auth.login.passkey,',
);
});
@@ -1,9 +1,6 @@
import { describe, it, expect } from "vitest";
import { Cpu, Fingerprint, Globe, KeyRound } from "lucide-react";
import {
iconForAuthProvider,
providerForAction,
} from "../_shared";
import { iconForAuthProvider, providerForAction } from "../_shared";
/**
* v1.4.25 W8b — Provider column for the admin Login-Übersicht.