From ba927b1faad68ab38d053ee9ea9eeac4b1a5531b Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 08:23:10 +0800
Subject: [PATCH] resolve merge conflicts: keep theirs for all binary files
---
Pub_Class/Pub_Class.sln | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Pub_Class/Pub_Class.sln b/Pub_Class/Pub_Class.sln
index 09e1f56..d479344 100644
--- a/Pub_Class/Pub_Class.sln
+++ b/Pub_Class/Pub_Class.sln
@@ -1,6 +1,8 @@
锘�
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.36631.11
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pub_Class", "Pub_Class.csproj", "{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}"
EndProject
Global
@@ -23,4 +25,7 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {501AE6C4-7697-4700-8F50-A2EBF7FC2693}
+ EndGlobalSection
EndGlobal
--
Gitblit v1.9.1