# Conflicts: # ViewModel/Send/SendViewModel.cs # minio.db |
||
|---|---|---|
| .. | ||
| CompleteUploadControl.xaml | ||
| CompleteUploadControl.xaml.cs | ||
| DownControl.xaml | ||
| DownControl.xaml.cs | ||
| SendControl.xaml | ||
| SendControl.xaml.cs | ||
| UpLoadControl.xaml | ||
| UpLoadControl.xaml.cs | ||
# Conflicts: # ViewModel/Send/SendViewModel.cs # minio.db |
||
|---|---|---|
| .. | ||
| CompleteUploadControl.xaml | ||
| CompleteUploadControl.xaml.cs | ||
| DownControl.xaml | ||
| DownControl.xaml.cs | ||
| SendControl.xaml | ||
| SendControl.xaml.cs | ||
| UpLoadControl.xaml | ||
| UpLoadControl.xaml.cs | ||