From a65c1c1ee58e38436261cdd82491ac889e43ce78 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Thu, 28 Sep 2023 22:22:44 +0000
Subject: [PATCH] chore: fix merge conflict

---
 app/controllers/api/health.php | 24 ------------------------
 composer.lock                  | 14 +++++++-------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index 5590f0906e..2b41e2fef8 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -388,11 +388,7 @@ App::get('/v1/health/queue/certificates')
     }, ['response']);
 
 App::get('/v1/health/queue/builds')
-<<<<<<< HEAD
-    ->desc('Get Builds Queue')
-=======
     ->desc('Get builds queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -409,11 +405,7 @@ App::get('/v1/health/queue/builds')
     }, ['response']);
 
 App::get('/v1/health/queue/databases')
-<<<<<<< HEAD
-    ->desc('Get Databases Queue')
-=======
     ->desc('Get databases queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -430,11 +422,7 @@ App::get('/v1/health/queue/databases')
     }, ['response']);
 
 App::get('/v1/health/queue/deletes')
-<<<<<<< HEAD
-    ->desc('Get Deletes Queue')
-=======
     ->desc('Get deletes queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -451,11 +439,7 @@ App::get('/v1/health/queue/deletes')
     }, ['response']);
 
 App::get('/v1/health/queue/mails')
-<<<<<<< HEAD
-    ->desc('Get Mails Queue')
-=======
     ->desc('Get mails queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -472,11 +456,7 @@ App::get('/v1/health/queue/mails')
     }, ['response']);
 
 App::get('/v1/health/queue/messaging')
-<<<<<<< HEAD
-    ->desc('Get Messaging Queue')
-=======
     ->desc('Get messaging queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -493,11 +473,7 @@ App::get('/v1/health/queue/messaging')
     }, ['response']);
 
 App::get('/v1/health/queue/migrations')
-<<<<<<< HEAD
-    ->desc('Get Migrations Queue')
-=======
     ->desc('Get migrations queue')
->>>>>>> 4f88ba8b881555d351430a4be94d071ebbb35b84
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
diff --git a/composer.lock b/composer.lock
index 4bee848a3e..c484f697e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2152,16 +2152,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.43.2",
+            "version": "0.43.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "f2626acd42665a9987c94af1c93bf20c28d55c9d"
+                "reference": "58d33c8d1216212edfba5d080e2f698487612aca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/f2626acd42665a9987c94af1c93bf20c28d55c9d",
-                "reference": "f2626acd42665a9987c94af1c93bf20c28d55c9d",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/58d33c8d1216212edfba5d080e2f698487612aca",
+                "reference": "58d33c8d1216212edfba5d080e2f698487612aca",
                 "shasum": ""
             },
             "require": {
@@ -2202,9 +2202,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.43.2"
+                "source": "https://github.com/utopia-php/database/tree/0.43.3"
             },
-            "time": "2023-09-07T19:04:33+00:00"
+            "time": "2023-09-28T01:51:22+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -6019,5 +6019,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }