From 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期二, 21 三月 2023 15:12:21 +0800
Subject: [PATCH] resolve conflict

---
 funasr/runtime/python/onnxruntime/setup.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/funasr/runtime/python/onnxruntime/setup.py b/funasr/runtime/python/onnxruntime/setup.py
index f062500..299910f 100644
--- a/funasr/runtime/python/onnxruntime/setup.py
+++ b/funasr/runtime/python/onnxruntime/setup.py
@@ -20,8 +20,8 @@
     version=VERSION_NUM,
     platforms="Any",
     description="Using paraformer with ONNXRuntime",
-    author="SWHL",
-    author_email="liekkaskono@163.com",
+    author="FunASR",
+    author_email="funasr@list.alibaba-inc.com",
     url="https://github.com/alibaba-damo-academy/FunASR",
     license='MIT',
     long_description=get_readme(),

--
Gitblit v1.9.1