Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105067 合并冲突

This commit is contained in:
SINVO\yangshunli 2025-02-08 10:45:41 +08:00
parent aaac1c51dc
commit fdadb70445
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/LectotypeViewModel.cs
View File

@ -764,7 +764,7 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
public void RemoveNotSavedLectotype(Dictionary<string, string> value) public void RemoveNotSavedLectotype(Dictionary<string, string> value)
{ {
value.ForEach(it => NotSavedLectotypeList.Remove(it.Key)); value.ForEach(it => NotSavedLectotypeList.Remove(it.Key));
<<<<<<< HEAD
} }
internal async Task<bool> CheckSaved() internal async Task<bool> CheckSaved()
@ -780,9 +780,9 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
return false; return false;
} }
} }
=======
}
>>>>>>> origin/master
internal Dictionary<string, string> GetNotSavedLectotypeList() internal Dictionary<string, string> GetNotSavedLectotypeList()
{ {