From dccbcc48a583eb38b4bc5b459d417087826846ac Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 12 四月 2023 18:06:29 +0800
Subject: [PATCH] resolve conflict
---
funasr/tasks/abs_task.py | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/funasr/tasks/abs_task.py b/funasr/tasks/abs_task.py
index e70b062..8d63b27 100644
--- a/funasr/tasks/abs_task.py
+++ b/funasr/tasks/abs_task.py
@@ -1594,11 +1594,7 @@
preprocess=iter_options.preprocess_fn,
max_cache_size=iter_options.max_cache_size,
max_cache_fd=iter_options.max_cache_fd,
-<<<<<<< HEAD
- dest_sample_rate=args.frontend_conf["fs"] if args.frontend_conf else 16000,
-=======
dest_sample_rate=dest_sample_rate,
->>>>>>> main
)
cls.check_task_requirements(
dataset, args.allow_variable_data_keys, train=iter_options.train
--
Gitblit v1.9.1