resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

 funasr/bin/lm_inference.py

@@ -129,8 +129,9 @@
        param_dict: dict = None,
    ):
        results = []
        if output_dir_v2 is not None:
            writer = DatadirWriter(output_dir_v2)
        output_path = output_dir_v2 if output_dir_v2 is not None else output_dir
        if output_path is not None:
            writer = DatadirWriter(output_path)
        else:
            writer = None