# Conflicts: # ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs |
||
|---|---|---|
| .. | ||
| old | ||
| DockpaneRecogidaViewModel.cs | ||
| PaneRecogidaSub1ViewModel.cs | ||
| PaneRecogidaViewModel.cs | ||
# Conflicts: # ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs |
||
|---|---|---|
| .. | ||
| old | ||
| DockpaneRecogidaViewModel.cs | ||
| PaneRecogidaSub1ViewModel.cs | ||
| PaneRecogidaViewModel.cs | ||