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

---
 data/config.php     | 3 ---
 docker-compose.yaml | 6 ------
 lib/frontend.php    | 3 ---
 settings.php        | 7 -------
 4 files changed, 19 deletions(-)

diff --git a/data/config.php b/data/config.php
index 888b4b7..0b495d7 100644
--- a/data/config.php
+++ b/data/config.php
@@ -122,11 +122,8 @@ class config{
 	const PROXY_BRAVE = false;
 	const PROXY_FB = false; // facebook
 	const PROXY_GOOGLE = false;
-<<<<<<< HEAD
 	const PROXY_GOOGLEALT = false;//ipv6 version of google
-=======
 	const PROXY_STARTPAGE = false;
->>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32
 	const PROXY_QWANT = false;
 	const PROXY_MARGINALIA = false;
 	const PROXY_MOJEEK = false;
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 845c69b..8c2d7c7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,17 +6,11 @@ services:
     image: luuul/4get:latest
     restart: unless-stopped
     environment:
-<<<<<<< HEAD
       - FOURGET_VERSION=6
       - FOURGET_SERVER_NAME=4get.itinerariummentis.org
-=======
-      - FOURGET_SERVER_NAME=4get.ca
->>>>>>> 0b68d6b2a9928d1b9dae389fbf5b95056e678be0
-
     ports:
       - "80:80"
       - "443:443"
-
     volumes:
       - /etc/letsencrypt/live/domain.tld:/etc/4get/certs
       # mount custom banners and captcha
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",
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