From 345edc823540089925b8ae60af34404d608fdfb4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 18 九月 2025 14:58:20 +0800
Subject: [PATCH] 首轮测试代码提交

---
 src/ModuleExport.cpp |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/ModuleExport.cpp b/src/ModuleExport.cpp
index 4e85bc5..2114d46 100644
--- a/src/ModuleExport.cpp
+++ b/src/ModuleExport.cpp
@@ -19,11 +19,7 @@
 	ModuleProcessLibInit();
 
 	if (modules.empty()) {
-<<<<<<< HEAD
 		modules.push_back(ModuleEntry("Input", ModuleType::PROC_INPUT, SignalSourceCreate, ufalse)); //SignalSource
-=======
-		modules.push_back(ModuleEntry("SignalSource", ModuleType::PROC_INPUT, SignalSourceCreate, ufalse));
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 //		modules.push_back(ModuleEntry("Input",ModuleType::PROC_INPUT, InputCreate, ufalse));
 		modules.push_back(ModuleEntry("Output",ModuleType::PROC_OUTPUT, OutputCreate, ufalse));
 

--
Gitblit v1.9.3