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 03:02:24 UTC

(incubator-answer) 02/02: feat: resolve confict

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

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

commit cc8dbb9b1cb229bd8fca9fb0165807b5853b2ba6
Merge: aade1d9b 877cfe81
Author: shuai <li...@sifou.com>
AuthorDate: Tue Apr 9 11:02:09 2024 +0800

    feat: resolve confict

 ui/src/components/PluginRender/index.tsx |  3 ++-
 ui/src/utils/pluginKit/interface.ts      | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)