w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-05 08:12:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix omitted conflict

Browse Source
This commit is contained in:
Bill Somerville 2018-10-03 19:33:10 +01:00
parent 6d096db6d5
commit dd25dc3ad0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Configuration.cpp
View File

@ -1004,13 +1004,10 @@ Configuration::impl::impl (Configuration * self, QNetworkAccessManager * network
// this must be done after the default paths above are set // this must be done after the default paths above are set
read_settings (); read_settings ();
<<<<<<< HEAD
// load LotW users data // load LotW users data
lotw_users_.load (writeable_data_dir_.absoluteFilePath ("lotw-user-activity.csv")); lotw_users_.load (writeable_data_dir_.absoluteFilePath ("lotw-user-activity.csv"));
// //
=======
>>>>>>> cd8f13b57... Implement a validator for FD and RTTY exchange entries.
// validation // validation
ui_->callsign_line_edit->setValidator (new CallsignValidator {this}); ui_->callsign_line_edit->setValidator (new CallsignValidator {this});
ui_->grid_line_edit->setValidator (new MaidenheadLocatorValidator {this}); ui_->grid_line_edit->setValidator (new MaidenheadLocatorValidator {this});