Revision bc27bb7e trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs | ||
---|---|---|
108 | 108 |
|
109 | 109 |
} |
110 | 110 |
|
111 |
protected override void OnViewLoaded(object view) |
|
112 |
{ |
|
113 |
base.OnViewLoaded(view); |
|
114 |
StatusKeeper.CleanupOrphanStates(); |
|
115 |
} |
|
116 |
|
|
111 | 117 |
/// <summary> |
112 | 118 |
/// Open an explorer window to the target path's directory |
113 | 119 |
/// and select the file |
... | ... | |
142 | 148 |
{ |
143 | 149 |
void Resolve(IEnumerable<ConflictFile> conflicts); |
144 | 150 |
} |
151 |
|
|
152 |
[Export(typeof(IConflictResolver))] |
|
153 |
public class DummyResolver:IConflictResolver |
|
154 |
{ |
|
155 |
public void Resolve(IEnumerable<ConflictFile> conflicts) |
|
156 |
{ |
|
157 |
|
|
158 |
} |
|
159 |
} |
|
145 | 160 |
} |
Also available in: Unified diff