From 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期二, 21 三月 2023 15:12:21 +0800
Subject: [PATCH] resolve conflict

---
 .gitignore |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8258377..603f712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@
 init_model/
 *.tar.gz
 test_local/
-RapidASR
\ No newline at end of file
+RapidASR
+export/*
+*.pyc
\ No newline at end of file

--
Gitblit v1.9.1