Resolve merge conflicts

wso2-extensions · Oct 24, 2023 · aae841d · aae841d
1 parent 9ba3501
commit aae841d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/...onents/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml b/...onents/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.75-SNAPSHOT</version>
+        <version>1.3.76-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...o2/carbon/identity/organization/user/invitation/management/InvitationCoreServiceImpl.java b/...o2/carbon/identity/organization/user/invitation/management/InvitationCoreServiceImpl.java
@@ -41,7 +41,6 @@
 import org.wso2.carbon.identity.organization.user.invitation.management.internal.UserInvitationMgtDataHolder;
 import org.wso2.carbon.identity.organization.user.invitation.management.models.Invitation;
 import org.wso2.carbon.identity.organization.user.invitation.management.models.RoleAssignments;
-import org.wso2.carbon.identity.organization.user.invitation.management.models.SharedUserAssociation;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
@@ -58,7 +57,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_ORGANIZATION_NOT_FOUND_FOR_TENANT;
 import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.CLAIM_EMAIL_ADDRESS;
 import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.DEFAULT_USER_STORE_DOMAIN;
 import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.EVENT_NAME_POST_ADD_INVITATION;

diff --git a/...organization/user/invitation/management/listener/OrgSharedUserOperationEventListener.java b/...organization/user/invitation/management/listener/OrgSharedUserOperationEventListener.java