fixed conflicts

This commit is contained in:
ronoaer 2023-09-09 08:52:16 +08:00
commit 3aa0adbf39
3 changed files with 0 additions and 3 deletions

View file

@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
{
qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
OpenVpnOverCloakProtocol::stop();
m_ckProcess.close();
}