killbill-aplcache

Merge branch 'master' of github.com:killbill/killbill Conflicts: payment/src/main/java/org/killbill/billing/payment/core/PaymentGatewayProcessor.java payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentAutomatonRunner.java payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java payment/src/main/java/org/killbill/billing/payment/core/sm/OperationCallbackBase.java payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java

6/21/2014 12:27:56 AM

stephane brossier

Commit: 8068efc

Tree: 65fed5f

Parents: 6a1725a
a8bec86

Changes

payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java 2(+2 -0)

Details

payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java 2(+2 -0)

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java
index bf999b3..a9a8db3 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/DirectPaymentOperation.java
@@ -35,6 +35,8 @@ import org.killbill.commons.locker.LockFailedException;
 
 import com.google.common.base.Objects;
 
+import com.google.common.base.Objects;
+
 // Encapsulates the payment specific logic
 public abstract class DirectPaymentOperation extends OperationCallbackBase implements OperationCallback {