From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 funasr/version.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/funasr/version.txt b/funasr/version.txt
index a3df0a6..3eefcb9 100644
--- a/funasr/version.txt
+++ b/funasr/version.txt
@@ -1 +1 @@
-0.8.0
+1.0.0

--
Gitblit v1.9.1