From e1c521ae18fbefb58a9edb3dd0ba6e9c942b02ab Mon Sep 17 00:00:00 2001 From: JzoNg Date: Sat, 9 May 2026 13:27:14 +0800 Subject: [PATCH] fix merge err --- packages/dify-ui/src/themes/theme.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/dify-ui/src/themes/theme.css b/packages/dify-ui/src/themes/theme.css index 1f9a273484..6fad0f39fd 100644 --- a/packages/dify-ui/src/themes/theme.css +++ b/packages/dify-ui/src/themes/theme.css @@ -816,10 +816,7 @@ --color-dify-logo-blue: var(--color-dify-logo-blue); --color-dify-logo-black: var(--color-dify-logo-black); -<<<<<<< HEAD --color-dify-logo-outline-1: var(--color-dify-logo-outline-1); --color-dify-logo-outline-2: var(--color-dify-logo-outline-2); -======= ->>>>>>> feat/hitl-form-enhancement }