fixed conflicts
This commit is contained in:
commit
3aa0adbf39
3 changed files with 0 additions and 3 deletions
|
|
@ -19,7 +19,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *pare
|
|||
|
||||
OpenVpnProtocol::~OpenVpnProtocol()
|
||||
{
|
||||
qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
|
||||
OpenVpnProtocol::stop();
|
||||
QThread::msleep(200);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue