resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

 .gitignore

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