From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交
---
SourceCode/Bond/Servo/CReport.cpp | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReport.cpp b/SourceCode/Bond/Servo/CReport.cpp
index 49f2fd0..1ab15fa 100644
--- a/SourceCode/Bond/Servo/CReport.cpp
+++ b/SourceCode/Bond/Servo/CReport.cpp
@@ -81,17 +81,6 @@
}
}
- /*
- for (int i = 0; i < m_variabels.size(); i++) {
- strResult += std::to_string(m_variabels[i]->getVarialbleId());
- strResult += "(";
- strResult += m_variabels[i]->getName();
- strResult += ")";
- if (i != m_variabels.size() - 1) {
- strResult += ",";
- }
- }
- */
return strResult;
}
--
Gitblit v1.9.3