From 77eef7169caa601e285c484c4b7b25882764b181 Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 12 四月 2023 18:18:06 +0800
Subject: [PATCH] resolve conflict

---
 funasr/runtime/python/websocket/requirements_client.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/funasr/runtime/python/websocket/requirements_client.txt b/funasr/runtime/python/websocket/requirements_client.txt
index 2531f41..9498d6d 100644
--- a/funasr/runtime/python/websocket/requirements_client.txt
+++ b/funasr/runtime/python/websocket/requirements_client.txt
@@ -1,2 +1,2 @@
 websockets
-import pyaudio
\ No newline at end of file
+pyaudio
\ No newline at end of file

--
Gitblit v1.9.1