// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.20508.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20508.0")]
+[assembly: AssemblyVersion("0.7.20509.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20509.0")]
\r
var othersNode = new DirectoryRecord\r
{\r
- DisplayName = "Shared to me",\r
+ DisplayName = "Shared with me",\r
Directories=accountNodes.ToList()\r
};\r
\r
DisplayName = AccountName ,\r
Directories = ownFolders.ToList()\r
};\r
+<<<<<<< HEAD
+\r
+ // Add Local Folders\r
+ ///var localFolders = SelectiveExtensions.LocalFolders(AccountName, Account.RootPath,client.StorageUrl.AbsoluteUri);\r
+\r
+ ///AppendToTree(localFolders, rootItem);\r
+=======
+>>>>>>> 8b6aa653d6c8a8cc3c40a93fca96459df726135a
\r
//For each local folder that doesn't exist in the server nodes \r
//find the best matching parent and add the folder below it.\r