Resolve merge conflict

Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>
project-chip · Jul 20, 2023 · 48c5c71 · 48c5c71
2 parents e280072 + 9d570fd
commit 48c5c71
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/platform/Tizen/WiFiManager.cpp b/src/platform/Tizen/WiFiManager.cpp
@@ -376,12 +376,12 @@ void WiFiManager::_ScanFinishedCb(wifi_manager_error_e wifiErr, void * userData)
 
 bool WiFiManager::_FoundAPOnScanCb(wifi_manager_ap_h ap, void * userData)
 {
-    bool cbRet     = true;
-    int wifiErr    = WIFI_MANAGER_ERROR_NONE;
-    char * essid   = nullptr;
-    char * bssid   = nullptr;
-    int rssi       = 0;
-    int freq       = 0;
+    bool cbRet   = true;
+    int wifiErr  = WIFI_MANAGER_ERROR_NONE;
+    char * essid = nullptr;
+    char * bssid = nullptr;
+    int rssi     = 0;
+    int freq     = 0;
 
     auto networkScanned = static_cast<std::vector<WiFiScanResponse> *>(userData);
     std::pair<WiFiBand, int> bandInfo;