Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-11-10 05:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removing merge fake conflicts

Browse source
This commit is contained in:
ZestyTS 2022-07-28 15:10:46 -07:00
parent 128ad89225
commit ece404f2fc
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UWUVCI AIO WPF/Models/MainViewModel.cs
View file

@ -1230,10 +1230,6 @@ namespace UWUVCI_AIO_WPF
} }
Progress = 100; Progress = 100;
}); });
<<<<<<< HEAD
=======
>>>>>>> Asynicify
DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this); DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this);
try try
{ {
@ -1277,10 +1273,6 @@ namespace UWUVCI_AIO_WPF
} }
Progress = 100; Progress = 100;
}); });
<<<<<<< HEAD
=======
>>>>>>> Asynicify
DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this); DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this);
try try
{ {