diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts index 84875920b6e73..79ede239203a8 100644 --- a/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts +++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts @@ -1558,6 +1558,10 @@ suite('ChatListRenderer', () => { configurationService.setUserConfiguration(ChatConfiguration.CollapseCompletedResponses, true); configurationService.setUserConfiguration('chat.checkpoints.enabled', false); configurationService.setUserConfiguration('chat.checkpoints.showFileChanges', false); +<<<<<<< HEAD +======= + configurationService.setUserConfiguration(ChatConfiguration.TurnStatusPills, false); +>>>>>>> f9a273540ca ([cherry-pick] agentHost: Preserve workspace transition boundaries (#334694)) configurationService.setUserConfiguration(ChatConfiguration.Verbose, false); instantiationService.stub(IConfigurationService, configurationService); instantiationService.stub(IChatService, new MockChatService());