From c2665ae528913b3053bfab08e2d6bd685629e365 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 29 Dec 2021 12:41:35 +0000
Subject: [PATCH] Resolve merge conflict

---
 includes/functions.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 81e642ed..526b3ae1 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -757,11 +757,6 @@ function qr_encode($str)
     return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
 }
 
-// Validates a host or FQDN
-function validate_host($host) {
-  return preg_match('/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i', $host);
-}
-
 function evalHexSequence($string) {
     $evaluator = function ($input) {
 	return hex2bin($input[1]);