Missed 2 merge conflict files, fixed

AzureAD · Mar 13, 2024 · 26efb02 · 26efb02
1 parent 731d9ab
commit 26efb02
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/MSAL/src/native_auth/public/MSALNativeAuthUserAccountResult.swift b/MSAL/src/native_auth/public/MSALNativeAuthUserAccountResult.swift
@@ -86,15 +86,9 @@ import Foundation
             let delegateDispatcher = CredentialsDelegateDispatcher(delegate: delegate, telemetryUpdate: controllerResponse.telemetryUpdate)
 
             switch controllerResponse.result {
-<<<<<<< HEAD
             case .success(let accessTokenResult):
                 await delegateDispatcher.dispatchAccessTokenRetrieveCompleted(
                     result: accessTokenResult,
-=======
-            case .success(let accessToken):
-                await delegateDispatcher.dispatchAccessTokenRetrieveCompleted(
-                    accessToken: accessToken,
->>>>>>> main
                     correlationId: controllerResponse.correlationId
                 )
             case .failure(let error):

diff --git a/MSAL/src/native_auth/public/state_machine/error/RetrieveAccessTokenError.swift b/MSAL/src/native_auth/public/state_machine/error/RetrieveAccessTokenError.swift
@@ -51,11 +51,6 @@ public class RetrieveAccessTokenError: MSALNativeAuthError {
             return MSALNativeAuthErrorMessage.browserRequired
         case .refreshTokenExpired:
             return MSALNativeAuthErrorMessage.refreshTokenExpired
-<<<<<<< HEAD
-=======
-        case .tokenNotFound:
-            return MSALNativeAuthErrorMessage.tokenNotFound
->>>>>>> main
         case .generalError:
             return MSALNativeAuthErrorMessage.generalError
         }
@@ -70,12 +65,4 @@ public class RetrieveAccessTokenError: MSALNativeAuthError {
     public var isRefreshTokenExpired: Bool {
         return type == .refreshTokenExpired
     }
-<<<<<<< HEAD
-=======
-
-    /// Returns `true` if the existing token cannot be found.
-    public var isTokenNotFound: Bool {
-        return type == .tokenNotFound
-    }
->>>>>>> main
 }