resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

 tests/test_lm_pipeline.py

@@ -18,7 +18,7 @@
            model='damo/speech_transformer_lm_zh-cn-common-vocab8404-pytorch',
        )
        rec_result = inference_pipeline(text_in="hello 大 家 好 呀")
        logger.info("asr inference result: {0}".format(rec_result))
        logger.info("lm inference result: {0}".format(rec_result))


if __name__ == '__main__':