From d1209e6c239a8787cac52a3a33edb275aa4ab7cb Mon Sep 17 00:00:00 2001
From: gesang <gesang@itinerariummentis.org>
Date: Mon, 15 Jul 2024 08:50:18 +0000
Subject: Fix merge issue

---
 lib/frontend.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib/frontend.php')

diff --git a/lib/frontend.php b/lib/frontend.php
index d40ea43..74a94de 100644
--- a/lib/frontend.php
+++ b/lib/frontend.php
@@ -924,11 +924,8 @@ class frontend{
 						"ddg" => "DuckDuckGo",
 						"brave" => "Brave",
 						"yandex" => "Yandex",
-<<<<<<< HEAD
-=======
 						"google" => "Google",
 						"startpage" => "Startpage",
->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32
 						"qwant" => "Qwant",
 						"yep" => "Yep",
 						"greppr" => "Greppr",
-- 
cgit v1.2.3