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 a17ce163035bc08934944f64721490815ada2630 Merge: 175c042a 498daa36 Author: shuai <[email protected]> AuthorDate: Wed Nov 15 14:20:04 2023 +0800 fix: resolve conflict ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx | 5 ++++- ui/src/pages/Admin/Login/index.tsx | 1 + ui/src/pages/Questions/Ask/index.tsx | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)
