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

---
 settings.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'settings.php')

diff --git a/settings.php b/settings.php
index 480625a..14d9549 100644
--- a/settings.php
+++ b/settings.php
@@ -130,17 +130,10 @@ $settings = [
 						"text" => "Yandex"
 					],
 					[
-<<<<<<< HEAD
-=======
-						"value" => "google",
-						"text" => "Google"
-					],
-					[
 						"value" => "startpage",
 						"text" => "Startpage"
 					],
 					[
->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32
 						"value" => "qwant",
 						"text" => "Qwant"
 					],
-- 
cgit v1.2.3