From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37f39fe..4023869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 modelscope
 samples
 .ipynb_checkpoints
+outputs*
+emotion2vec*

--
Gitblit v1.9.1