From b1f7e464a06645900cef4c08098ce894b7bd8439 Mon Sep 17 00:00:00 2001 From: Evan Greer Date: Fri, 17 Nov 2023 08:10:52 -0700 Subject: [PATCH] resolves merge conflict --- swift-sdk/Internal/InternalIterableAPI.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift index 2c4b8064..9fcedbce 100644 --- a/swift-sdk/Internal/InternalIterableAPI.swift +++ b/swift-sdk/Internal/InternalIterableAPI.swift @@ -82,18 +82,16 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider { self.dependencyContainer.createAuthManager(config: self.config) }() -<<<<<<< HEAD lazy var embeddedManager: IterableEmbeddedManagerProtocol = { self.dependencyContainer.createEmbeddedManager(config: self.config, apiClient: self.apiClient) }() -======= + var apiEndPointForTest: String { get { apiEndPoint } } ->>>>>>> master // MARK: - SDK Functions