105067 合并冲突
This commit is contained in:
parent
aaac1c51dc
commit
fdadb70445
|
@ -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()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue