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 8c429992a1fce34f9c03a64b7e95feff96204e7c Merge: ec16ac9a 9ed0ab48 Author: shuai <[email protected]> AuthorDate: Mon Jul 15 15:53:05 2024 +0800 fix: resolve conflict ui/src/utils/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
