From b2493ed4cd6affd78910fd4d01bd93351a36cde5 Mon Sep 17 00:00:00 2001
From: bernardhanna <bernard@matrixinternet.ie>
Date: Mon, 24 Mar 2025 12:12:36 +0000
Subject: [PATCH 1/2] Fix: Clean SearchController to remove merge conflict
 markers

---
 app/Http/Controllers/SearchController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 739232cbf..05999a98a 100755
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @Author: Bernard Hanna
- * @Date:   2025-03-21 19:14:36
- * @Last Modified by:   Bernard Hanna
- */
-
-
 namespace App\Http\Controllers;
 
 use App\Country;
@@ -138,3 +131,10 @@ protected function getAllEventsToMap(EventFilters $filters)
         return $value;
     }
 }
+        });
+
+        Log::info("Serving from cache [{$composed_key}]");
+
+        return $value;
+    }
+}

From 906c9c106ebb0a40de3a4b1d6ddd890a1278cf1d Mon Sep 17 00:00:00 2001
From: bernardhanna <bernard@matrixinternet.ie>
Date: Mon, 24 Mar 2025 12:14:00 +0000
Subject: [PATCH 2/2] Fix: Clean SearchController to remove merge conflict
 markers

---
 app/Http/Controllers/SearchController.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 05999a98a..9b59747a4 100755
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -131,10 +131,3 @@ protected function getAllEventsToMap(EventFilters $filters)
         return $value;
     }
 }
-        });
-
-        Log::info("Serving from cache [{$composed_key}]");
-
-        return $value;
-    }
-}