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/EAPSimulator/EAPSimulator.vcxproj.user |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulator.vcxproj.user b/SourceCode/Bond/EAPSimulator/EAPSimulator.vcxproj.user
index 88a5509..ff5ccd7 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulator.vcxproj.user
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulator.vcxproj.user
@@ -1,4 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup>
+    <RESOURCE_FILE>EAPSimulator.rc</RESOURCE_FILE>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3