From 0756725cd1272693ebe33ddb341a128f38986b00 Mon Sep 17 00:00:00 2001
From: killua <1223086337@qq.com>
Date: Thu, 23 May 2024 10:44:14 +0800
Subject: [PATCH] =?UTF-8?q?uptdate:=20=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=92=8C=E4=BE=9D=E8=B5=96=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md        | 18 +++++++++---------
 requirements.txt |  6 +-----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 28d5c4d..b858cdf 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ TakwayAI/
 git clone http://43.132.157.186:3000/killua/TakwayPlatform.git
 ```
 
-#### (2) 安装依赖
+#### (2) 创建虚拟环境
 
 创建虚拟环境
 
@@ -73,14 +73,7 @@ conda create -n takway python=3.9
 conda activate takway
 ```
 
-安装依赖
-
-``` shell
-cd TakwayPlatform/
-pip install -r requirements.txt
-```
-
-#### (3) 安装openvoice
+#### (3) 安装依赖
 
 如果你的本地环境可以科学上网，则直接运行下面两行指令
 
@@ -138,6 +131,13 @@ export HF_ENDPOINT=https://hf-mirror.com
 
 将averaged_perceptron_tragger.zip放入taggers文件夹下
 
+4. 下载其他依赖
+
+``` shell
+cd TakwayPlatform/
+pip install -r requirements.txt
+```
+
 #### (4) 安装FunASR
 
 本项目使用的FunASRE在github上的FunASR的基础上做了一些修改
diff --git a/requirements.txt b/requirements.txt
index f218acb..6d9c5d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,9 +21,5 @@ apscheduler
 aiohttp
 faster_whisper
 whisper_timestamped
-<<<<<<< Updated upstream
 modelscope
-=======
-modelscope
-wavmark
->>>>>>> Stashed changes
+wavmark
\ No newline at end of file