resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

 .gitignore

@@ -7,4 +7,6 @@
init_model/
*.tar.gz
test_local/
RapidASR
RapidASR
export/*
*.pyc