diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-09-02 16:46:23 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-09-02 16:46:23 +0300 |
| commit | cdfa8777b7d433816c2ec5f12b826b53bda917dd (patch) | |
| tree | cc51fe4ba63301dfc69e07a0d7912a5ca3535e39 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs | |
| parent | 2d32d2c6dba3b8dc90692e8c30d509b3c83bc462 (diff) | |
| parent | 62905aaa550ea584f29feae2ba35fc6df6c42c8f (diff) | |
| download | Tango-cdfa8777b7d433816c2ec5f12b826b53bda917dd.tar.gz Tango-cdfa8777b7d433816c2ec5f12b826b53bda917dd.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs index 15f21bce1..c181d7b9d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -194,7 +194,7 @@ namespace Tango.MachineStudio.UI.ViewModels catch (Exception ex) { LogManager.Log(ex, "Login Error."); - _notificationProvider.ShowError($"An error occurred while trying to perform the logging operation.\n{ex.FlattenMessage()}"); + _notificationProvider.ShowError($"An error occurred while trying to perform the log-in operation.\n{ex.FlattenMessage()}"); } finally { |