w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-30 13:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missed merge conflict

Browse Source
This commit is contained in:
Bill Somerville 2021-01-04 23:01:04 +00:00
parent e3de5480e2
commit 40cf752fe6
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widgets/mainwindow.cpp
View File

@ -1034,7 +1034,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message () void MainWindow::not_GA_warning_message ()
{ {
<<<<<<< HEAD
// MessageBox::critical_message (this, // MessageBox::critical_message (this,
// "This is a pre-release version of WSJT-X 2.3.0 made\n" // "This is a pre-release version of WSJT-X 2.3.0 made\n"
// "available for testing purposes. By design it will\n" // "available for testing purposes. By design it will\n"
@ -1043,16 +1042,6 @@ void MainWindow::not_GA_warning_message ()
// if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) { // if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) {
// Q_EMIT finished (); // Q_EMIT finished ();
// } // }
=======
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.3.0 made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on Jan 26, 2021.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2021, 1, 26}, {0, 0}, Qt::UTC}) {
Q_EMIT finished ();
}
>>>>>>> master
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()