Skip to content

Commit a7538fc

Browse files
committed
Merge remote-tracking branch 'origin/support-35419' into support-35419
# Conflicts: # commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java
2 parents e9c5dcb + afe9f95 commit a7538fc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ de95c481329aa8b821e6e71ac35c1b8bc67e3e86
99
78c44064f4ec15091bde7a2dc590aa2b3a99341d
1010
03665b75a1e1c3a3cf28df1dec52e91b308e4368
1111
7e25c796da25ae080a952936de535a1228fed448
12+
7ceb871552e5d9cb0379fbba014690aa067061eb

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
package com.commercetools.api.models.payment;
33

4+
import java.util.Optional;
5+
46
import com.commercetools.api.models.common.LocalizedString;
57
import com.commercetools.api.models.payment_method.PaymentMethodToken;
68
import com.commercetools.api.models.type.CustomFields;
79
import com.commercetools.api.models.type.CustomFieldsMixin;
810

9-
import java.util.Optional;
10-
1111
public interface PaymentMethodInfoMixin {
1212

1313
public String getPaymentInterface();

0 commit comments

Comments
 (0)