From fe4d335b54ede7a47fd4bcf5c228fb427cbcc8c9 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期二, 20 一月 2026 14:46:01 +0800
Subject: [PATCH] 新增通道参数拷贝功能
---
src/tg/tg_scene.h | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/tg/tg_scene.h b/src/tg/tg_scene.h
index 61a7047..de25cbe 100644
--- a/src/tg/tg_scene.h
+++ b/src/tg/tg_scene.h
@@ -13,11 +13,7 @@
#include "../protocol.h"
#include "module_def.h"
-<<<<<<< HEAD
#pragma pack (1)
-=======
-
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
typedef struct {
unsigned short magic;
unsigned short nmds;
@@ -28,13 +24,7 @@
tag_input input; //1362
-<<<<<<< HEAD
tag_module in1[MAX_INPUT_NUM]; //4352
-=======
- tag_input input;//1282
-
- tag_module in1[MAX_INPUT_NUM];
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
tag_module in2[MAX_INPUT_NUM];
tag_module in3[MAX_INPUT_NUM];
tag_module in4[MAX_INPUT_NUM];
--
Gitblit v1.9.3