remove forget merge symbol

OrifInformatique · Jan 31, 2024 · 71eb6f7 · 71eb6f7
1 parent 5d14f36
commit 71eb6f7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/orif/user/Controllers/Auth.php b/orif/user/Controllers/Auth.php
@@ -218,7 +218,6 @@ public function createNewUser() {
      */
     public function azure_login(): string|Response
     {
-<<<<<<< HEAD
         $client_id = getenv('CLIENT_ID');
         $client_secret = getenv('CLIENT_SECRET');
         $ad_tenant = getenv('TENANT_ID');
@@ -359,9 +358,6 @@ public function azure_login(): string|Response
     public function login(): string|Response
     {
         // If user is not already logged
-=======
-        // If user not yet logged in
->>>>>>> Release-4.4
         if(!(isset($_SESSION['logged_in']) && $_SESSION['logged_in'] == true)) {
 
             // Store the redirection URL in a session variable