From 5017fb16b9b1248703449031583cf34ecc4a3e6f Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 29 Dec 2021 15:36:22 +0000
Subject: [PATCH] Fix merge conflict

---
 app/img/wifi-qr-code.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/img/wifi-qr-code.php b/app/img/wifi-qr-code.php
index a36966c3..acecfe85 100644
--- a/app/img/wifi-qr-code.php
+++ b/app/img/wifi-qr-code.php
@@ -10,11 +10,6 @@ if (!isset($_SERVER['HTTP_REFERER'])) {
     exit;
 }
 
-function qr_encode($str)
-{
-    return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
-}
-
 $hostapd = parse_ini_file(RASPI_HOSTAPD_CONFIG, false, INI_SCANNER_RAW);
 
 // assume wpa encryption and get the passphrase