Skip to content

Commit 2712732

Browse files
committed
chore: fix bad merge conflict resolution
1 parent 36f4569 commit 2712732

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

lithic-java-core/src/main/kotlin/com/lithic/api/client/LithicClient.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import com.lithic.api.services.blocking.TokenizationDecisioningService
3232
import com.lithic.api.services.blocking.TokenizationService
3333
import com.lithic.api.services.blocking.TransactionService
3434
import com.lithic.api.services.blocking.TransferService
35+
import com.lithic.api.services.blocking.WebhookService
3536

3637
interface LithicClient {
3738

lithic-java-core/src/main/kotlin/com/lithic/api/client/LithicClientAsync.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import com.lithic.api.services.async.TokenizationDecisioningServiceAsync
3232
import com.lithic.api.services.async.TokenizationServiceAsync
3333
import com.lithic.api.services.async.TransactionServiceAsync
3434
import com.lithic.api.services.async.TransferServiceAsync
35+
import com.lithic.api.services.async.WebhookServiceAsync
3536
import java.util.concurrent.CompletableFuture
3637

3738
interface LithicClientAsync {

lithic-java-core/src/main/kotlin/com/lithic/api/client/LithicClientAsyncImpl.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ import com.lithic.api.services.async.TransactionServiceAsync
6464
import com.lithic.api.services.async.TransactionServiceAsyncImpl
6565
import com.lithic.api.services.async.TransferServiceAsync
6666
import com.lithic.api.services.async.TransferServiceAsyncImpl
67+
import com.lithic.api.services.async.WebhookServiceAsync
68+
import com.lithic.api.services.async.WebhookServiceAsyncImpl
6769
import java.util.concurrent.CompletableFuture
6870

6971
class LithicClientAsyncImpl

lithic-java-core/src/main/kotlin/com/lithic/api/client/LithicClientImpl.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ import com.lithic.api.services.blocking.TransactionService
6464
import com.lithic.api.services.blocking.TransactionServiceImpl
6565
import com.lithic.api.services.blocking.TransferService
6666
import com.lithic.api.services.blocking.TransferServiceImpl
67+
import com.lithic.api.services.blocking.WebhookService
68+
import com.lithic.api.services.blocking.WebhookServiceImpl
6769

6870
class LithicClientImpl
6971
constructor(

0 commit comments

Comments
 (0)