From 8418de15a4b9b2c0565bfae31240f8cc708769ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Tue, 19 Nov 2019 13:25:30 +0100
Subject: [PATCH] Fix conflict with other branch

---
 libnymea-networkmanager/networkmanager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libnymea-networkmanager/networkmanager.cpp b/libnymea-networkmanager/networkmanager.cpp
index c15b3c0..5449cb8 100644
--- 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");