resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

resolve conflict

 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