mirror of
https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF
synced 2024-11-10 05:34:13 +00:00
Removing merge fake conflicts
This commit is contained in:
parent
128ad89225
commit
ece404f2fc
1 changed files with 0 additions and 8 deletions
|
@ -1230,10 +1230,6 @@ namespace UWUVCI_AIO_WPF
|
|||
}
|
||||
Progress = 100;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> Asynicify
|
||||
DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this);
|
||||
try
|
||||
{
|
||||
|
@ -1277,10 +1273,6 @@ namespace UWUVCI_AIO_WPF
|
|||
}
|
||||
Progress = 100;
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> Asynicify
|
||||
DownloadWait dw = new DownloadWait("Downloading needed Data - Please Wait", "", this);
|
||||
try
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue