Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

[pithos-ms-client] / trunk / Pithos.Client.WPF / SelectiveSynch / SelectiveSynchViewModel.cs

diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
index 2128929..ccf2587 100644 (file)
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
@@ -148,11 +148,14 @@ namespace Pithos.Client.WPF.SelectiveSynch
                                    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