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

---
 funasr/models/conformer/template.yaml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/funasr/models/conformer/template.yaml b/funasr/models/conformer/template.yaml
index 6094313..4cbeca4 100644
--- a/funasr/models/conformer/template.yaml
+++ b/funasr/models/conformer/template.yaml
@@ -2,8 +2,8 @@
 # You can modify the configuration according to your own requirements.
 
 # to print the register_table:
-# from funasr.utils.register import registry_tables
-# registry_tables.print()
+# from funasr.register import tables
+# tables.print()
 
 # network architecture
 #model: funasr.models.paraformer.model:Paraformer

--
Gitblit v1.9.1