From 4cac7f5edd838b111e6635fc3312bcd8127d2cf1 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 5 Mar 2024 11:31:15 +0100
Subject: [PATCH] fix: merge conflicts

---
 app/controllers/general.php               | 6 +++++-
 src/Appwrite/Auth/MFA/Challenge/Email.php | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 32c7fa8285..abfe9f41b9 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -374,11 +374,15 @@ App::init()
     ->inject('console')
     ->inject('project')
     ->inject('dbForConsole')
+    ->inject('getProjectDB')
     ->inject('locale')
     ->inject('localeCodes')
     ->inject('clients')
+    ->inject('geodb')
+    ->inject('queueForUsage')
+    ->inject('queueForEvents')
     ->inject('queueForCertificates')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, Locale $locale, array $localeCodes, array $clients, Certificate $queueForCertificates) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage,Event $queueForEvents,Certificate $queueForCertificates) {
         /*
         * Appwrite Router
         */
diff --git a/src/Appwrite/Auth/MFA/Challenge/Email.php b/src/Appwrite/Auth/MFA/Challenge/Email.php
index be860aba22..373b9db72b 100644
--- a/src/Appwrite/Auth/MFA/Challenge/Email.php
+++ b/src/Appwrite/Auth/MFA/Challenge/Email.php
@@ -3,6 +3,7 @@
 namespace Appwrite\Auth\MFA\Challenge;
 
 use Appwrite\Auth\MFA\Challenge;
+use Appwrite\Auth\MFA\Type;
 use Utopia\Database\Document;
 
 class Email extends Challenge