From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改

---
 HDL_ON/Common/R.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 2a4d761..6f4facd 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
 {
     public static class StringId
     {
-
+        /// <summary>
+        /// 瑙掑害
+        /// </summary>
+        public const int Angle = 544;
         /// <summary>
         /// 鑾峰彇鏇村
         /// </summary>

--
Gitblit v1.8.0