From 434dd025f1c35eaaf247fd434a8fe880bf6d9204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Mon, 11 Apr 2022 20:21:13 +0200
Subject: [PATCH] Fix merge conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 api_FTL.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/api_FTL.php b/api_FTL.php
index 92bb0ab9..a2196c32 100644
--- a/api_FTL.php
+++ b/api_FTL.php
@@ -303,13 +303,9 @@ if (isset($_GET['getAllQueries']) && $auth) {
         $return = callFTLAPI("getallqueries");
     }
 
-<<<<<<< HEAD
     if (array_key_exists("FTLnotrunning", $return)) {
       $data = array("FTLnotrunning" => true);
     } else {
-=======
-    if (!in_array("FTLnotrunning", $return )) {
->>>>>>> Add proper guarding
       // Start the JSON string
       echo '{"data":[';
       $first = true;