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/utils/timestamp_tools.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/funasr/utils/timestamp_tools.py b/funasr/utils/timestamp_tools.py
index 09c3bec..423110c 100644
--- a/funasr/utils/timestamp_tools.py
+++ b/funasr/utils/timestamp_tools.py
@@ -1,5 +1,3 @@
-from pydoc import TextRepr
-from scipy.fftpack import shift
 import torch
 import copy
 import codecs

--
Gitblit v1.9.1