Removing merge fake conflicts

This commit is contained in:
ZestyTS 2022-07-28 15:10:46 -07:00
parent 128ad89225
commit ece404f2fc

View file

@ -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
{