Fixed conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason
2019-11-26 14:54:46 -08:00
2 changed files with 5 additions and 0 deletions

View File

@@ -359,6 +359,7 @@ int RDCartDialog::exec(int *cartnum,RDCart::Type type,QString *svcname,
}
item=(RDListViewItem *)item->nextSibling();
}
cart_filter_edit->setFocus();
return QDialog::exec();
}