merge conflicts -take remote

1 files changed, 8 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
index 536409f63..c8b2fce32 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
@@ -5,13 +5,19 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
+using Tango.Core;
 using Tango.FileSystem.Network;
 
 namespace Tango.FileSystem
 {
-    public abstract class FileSystemItem
+    public abstract class FileSystemItem : ExtendedObject
     {
-        public String Path { get; set; }
+        private String _path;
+        public String Path
+        {
+            get { return _path; }
+            set { _path = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(Name)); }
+        }
 
         public FileSystemItemType Type { get; protected set; }