From afc7a07d285e08d905c58dd5978441c155b2f296 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 19 Dec 2017 10:25:40 +0200
Subject: MERGE.

---
 .../Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
index 11c0adc0e..a0ce93a5a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
@@ -3,17 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
     public class MainViewVM : ViewModel
     {
-        public String Text { get; set; }
-
         public MainViewVM() : base()
         {
-            Text = "Hi ROy";
+
         }
     }
 }
-- 
cgit v1.3.1