From a1efbbfeed87d8bd7f281f46c5279418906f3d1d Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Mon, 18 May 2026 14:11:38 +0200 Subject: [PATCH] fix merge conflict Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- pkg/agent/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/agent/config_test.go b/pkg/agent/config_test.go index dbcd72dd..c7137ca6 100644 --- a/pkg/agent/config_test.go +++ b/pkg/agent/config_test.go @@ -319,7 +319,7 @@ func Test_ValidateAndCombineConfig(t *testing.T) { withCmdLineFlags("--client-id", "5bc7d07c-45da-11ef-a878-523f1e1d7de1", "--private-key-path", privKeyPath, "--venafi-cloud"), ) require.NoError(t, err) - assert.Equal(t, VenafiCloudKeypair, got.AuthMode) + assert.Equal(t, VenafiCloudKeypair, got.OutputMode) assert.IsType(t, &client.VenafiCloudClient{}, cl) })