From: pkanavos <pkanavos@gmail.com>
Date: Tue, 8 May 2012 16:14:12 +0000 (+0300)
Subject: -
X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/commitdiff_plain/276ee94df1758c458ffbb939d7515ed4095bf5af?hp=ecd1dddfd45aa4a4553dd199b7413b6fbe6aeb26

-
---

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 45a2571..65f7bc5 100644
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // 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.20509.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20509.0")]
+[assembly: AssemblyVersion("0.7.20510.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20510.0")]
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
index ccf2587..c614eef 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
@@ -148,14 +148,11 @@ namespace Pithos.Client.WPF.SelectiveSynch
                                    DisplayName = AccountName ,
                                    Directories = ownFolders.ToList()
                                };
-<<<<<<< HEAD
 
             // Add Local Folders
-            ///var localFolders = SelectiveExtensions.LocalFolders(AccountName, Account.RootPath,client.StorageUrl.AbsoluteUri);
+            //var localFolders = SelectiveExtensions.LocalFolders(AccountName, Account.RootPath,client.StorageUrl.AbsoluteUri);
+            //AppendToTree(localFolders, rootItem);
 
-            ///AppendToTree(localFolders, rootItem);
-=======
->>>>>>> 8b6aa653d6c8a8cc3c40a93fca96459df726135a
             
             //For each local folder that doesn't exist in the server nodes 
             //find the best matching parent and add the folder below it.