From 28513a91ee10a4c68a829aa0c8322a8ebf552609 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Sat, 4 Nov 2017 12:56:51 +0800 Subject: [PATCH] Removing conflict --- includes/hostapd.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/includes/hostapd.php b/includes/hostapd.php index 1b4eccaa..1465d333 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -461,11 +461,6 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status) // Check for Logging Checkbox $logEnable = 0; -<<<<<<< HEAD -======= - echo "SOMETHING ".$arrHostapdConf['LogEnable']; - echo 'logenable set:'.$_POST['logEnable']; ->>>>>>> 604b28130fd2e331a8c13b773239e0dcf0fa2fdf if($arrHostapdConf['LogEnable'] == 0) { if(isset($_POST['logEnable'])) { // Need code to enable logfile logging here