rebase conflict fix
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5dd46dca Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5dd46dca Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5dd46dca Branch: refs/heads/master Commit: 5dd46dca1c8e91d410ab8447468fc415da9e5709 Parents: 407a123 Author: Udara Liyanage <[email protected]> Authored: Thu Dec 18 12:01:28 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 18 12:07:00 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5dd46dca/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 7b3fa48..db25905 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -52,7 +52,6 @@ import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.RegistryType; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.session.UserRegistry; -import org.wso2.carbon.stratos.common.beans.TenantInfoBean; import org.wso2.carbon.stratos.common.exception.StratosException; import org.wso2.carbon.tenant.mgt.core.TenantPersistor; import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil;
