mirror of
https://github.com/RaspAP/raspap-webgui.git
synced 2024-11-21 23:20:22 +00:00
Fix merge conflict
This commit is contained in:
parent
0c5ecb549d
commit
5017fb16b9
1 changed files with 0 additions and 5 deletions
|
@ -10,11 +10,6 @@ if (!isset($_SERVER['HTTP_REFERER'])) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
function qr_encode($str)
|
|
||||||
{
|
|
||||||
return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
|
|
||||||
}
|
|
||||||
|
|
||||||
$hostapd = parse_ini_file(RASPI_HOSTAPD_CONFIG, false, INI_SCANNER_RAW);
|
$hostapd = parse_ini_file(RASPI_HOSTAPD_CONFIG, false, INI_SCANNER_RAW);
|
||||||
|
|
||||||
// assume wpa encryption and get the passphrase
|
// assume wpa encryption and get the passphrase
|
||||||
|
|
Loading…
Reference in a new issue