From fdadb70445974930cc9bde65c2680327ac2f1b64 Mon Sep 17 00:00:00 2001
From: "SINVO\\yangshunli" <yangshunli@sinvo.cn>
Date: Sat, 8 Feb 2025 10:45:41 +0800
Subject: [PATCH] =?UTF-8?q?105067=20=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModel/LectotypeViewModel.cs                       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs
index 1dded01..1a15fd8 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs
@@ -764,7 +764,7 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
     public void RemoveNotSavedLectotype(Dictionary<string, string> value)
     {
         value.ForEach(it => NotSavedLectotypeList.Remove(it.Key));
-<<<<<<< HEAD
+
     }
 
     internal async Task<bool> CheckSaved()
@@ -780,9 +780,9 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
             return false;
         }
     }
-=======
-    } 
->>>>>>> origin/master
+
+    
+
 
     internal Dictionary<string, string> GetNotSavedLectotypeList()
     {