Revision 276ee94d trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
| b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs | ||
|---|---|---|
| 148 | 148 |
DisplayName = AccountName , |
| 149 | 149 |
Directories = ownFolders.ToList() |
| 150 | 150 |
}; |
| 151 |
<<<<<<< HEAD |
|
| 152 | 151 |
|
| 153 | 152 |
// Add Local Folders |
| 154 |
///var localFolders = SelectiveExtensions.LocalFolders(AccountName, Account.RootPath,client.StorageUrl.AbsoluteUri); |
|
| 153 |
//var localFolders = SelectiveExtensions.LocalFolders(AccountName, Account.RootPath,client.StorageUrl.AbsoluteUri); |
|
| 154 |
//AppendToTree(localFolders, rootItem); |
|
| 155 | 155 |
|
| 156 |
///AppendToTree(localFolders, rootItem); |
|
| 157 |
======= |
|
| 158 |
>>>>>>> 8b6aa653d6c8a8cc3c40a93fca96459df726135a |
|
| 159 | 156 |
|
| 160 | 157 |
//For each local folder that doesn't exist in the server nodes |
| 161 | 158 |
//find the best matching parent and add the folder below it. |
Also available in: Unified diff