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. 代码合并冲突，重新提交

---
 .gitignore |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99779f8..38a88e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,14 @@
 SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj.user
 SourceCode/Bond/x64/Debug/ServoConfiguration.ini
 *.iobj
+SourceCode/Bond/x64/Debug/Backups/
+Document/鍏变韩鏂囦欢澶�/
+Document/鍏变韩鏂囦欢澶�.rar
+SourceCode/Bond/x64/Debug/Master.dat
+SourceCode/Bond/x64/Debug/Config/signals.csv
+SourceCode/Bond/x64/Debug/Config/robot_offset.ini
+*.tlog
+*.pch
+SourceCode/Bond/EAPSimulator/x64/
+Document/___CEID_________________.csv
+Document/______CEID__.csv

--
Gitblit v1.9.3