killbill-uncached

Fix merge issue

11/16/2011 7:53:23 PM

stephane brossier

Commit: f245d38

Tree: 9c1a928

Parents: ced6427

Changes

entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java 2(+1 -1)

Details

entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java 2(+1 -1)

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
index 81b89e6..5306ba8 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiBase.java
@@ -55,7 +55,7 @@ import java.util.List;
 import java.util.UUID;
 
 import static org.testng.Assert.*;
->>>>>>> master
+
 
 public abstract class TestUserApiBase {