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

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

diff --git a/src/scene.cpp b/src/scene.cpp
index e8618b9..603de68 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -139,7 +139,10 @@
 			for(j = 0 ; j< ninports ;j ++, phy_id++) {
 				phy_id->mIntType = 0;
 				phy_id->mPhyID = hw_adapter->get_physical_channel(1, rxBufID[j]-1);
+<<<<<<< HEAD
 //				printf("PhyID:%d\n", phy_id->mPhyID);
+=======
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 			}
 			size += ninports*sizeof(PhyPort);
 		}

--
Gitblit v1.9.3