You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@answer.apache.org by sh...@apache.org on 2024/04/09 08:57:49 UTC

(incubator-answer) 01/01: fix: resolve conflict

This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git

commit 38edc4eb542ada8a077aa0a91bfb30f14d48f66b
Merge: 4261c461 a7bd5e34
Author: shuai <li...@sifou.com>
AuthorDate: Tue Apr 9 16:57:38 2024 +0800

    fix: resolve conflict

 ui/src/utils/pluginKit/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)