From 8758151dcdb0f89e362dd297405a384d3a034380 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期三, 28 一月 2026 20:21:37 +0800
Subject: [PATCH] 天宫输入源模块设置时爆音及参数拷贝更新

---
 src/tg/tg_config.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/tg/tg_config.h b/src/tg/tg_config.h
index 7db0fb7..de4d30a 100644
--- a/src/tg/tg_config.h
+++ b/src/tg/tg_config.h
@@ -10,11 +10,7 @@
 #include "config.h"
 
 //项目定制化宏定义.
-<<<<<<< HEAD
 #define MAX_INPUT_NUM 34	// ana:16, dante:16, usb:2
-=======
-#define MAX_INPUT_NUM 34
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 #define MAX_OUTPUT_NUM 34
 
 #define FEEDBACK_FILTERS_NUM 16	//NHS滤波器组数目

--
Gitblit v1.9.3