Fix conflict with other branch

2019-11-19 13:25:30 +01:00 · 2019-11-19 13:25:30 +01:00 · 8418de15a4
parent f38c47d039
commit 8418de15a4
1 changed files with 1 additions and 4 deletions
--- a/libnymea-networkmanager/networkmanager.cpp
+++ b/libnymea-networkmanager/networkmanager.cpp
@ -164,10 +164,7 @@ NetworkManager::NetworkManagerError NetworkManager::connectWifi(const QString &i
    // Note: disable power save mode
    wirelessSettings.insert("powersave", 2);

-    if (hidden) {
-
-        wirelessSettings.insert("hidden", true);
-    }
+    if (hidden) wirelessSettings.insert("hidden", true);

    QVariantMap wirelessSecuritySettings;
    wirelessSecuritySettings.insert("auth-alg", "open");